Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-09-06 8745b76acfd45eadd720d7ce6d87c77e6e0682b9

 src/main/webapp/views/itemReport/itemReport.html

@@ -40,7 +40,7 @@
</script>

<script type="text/html" id="operate">
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>-->
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
<!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>-->
    <a class="layui-btn layui-btn layui-btn-xs btn-edit" lay-event="makeReport">生成报告</a>
</script>
@@ -91,7 +91,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">质量问题描述: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="qualityReson" placeholder="为空表示无">
                        <input class="layui-input" name="qualityReason" placeholder="为空表示无">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
@@ -119,6 +119,12 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常描述: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="issue" placeholder="为空表示无">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">总结: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="conclusion" placeholder="请输入总结">