Merge branch 'master' into Liudl

bklLiudl

2024-10-19 fe41831b0e9057a16aef1e82048105aee671bbda

 HTML/views/QualityControl/QualityInformation.html

@@ -32,11 +32,11 @@
                        <input type="text" id="ASNNo" name="ASNNo" placeholder="请输入入库单据" autocomplete="off" class="layui-input">
                     </div>
                  </div> -->
                  <!-- 批次 -->
                  <!-- 进厂编号 -->
                  <div class="layui-inline">
                     <label class="layui-form-label" style="width: 60px;">批次号</label>
                     <label class="layui-form-label" style="width: 60px;">进厂编号</label>
                     <div class="layui-input-inline">
                        <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                        <input type="text" id="LotNo" name="LotNo" placeholder="请输入进厂编号" autocomplete="off" class="layui-input">
                     </div>
                  </div>
                  <!-- 物料号 -->
@@ -147,7 +147,7 @@
                     field: 'Standard',title: '物料规格',align: 'center'  
                  }, 
                  {
                     field: 'LotNo',title: '批次号',align: 'center' 
                     field: 'LotNo',title: '进厂编号',align: 'center' 
                  },
                  {
                     field: 'IsQualified',title: '检验结果',align: 'center',templet: '#IsQualifiedButton',
@@ -347,7 +347,7 @@
                  title: '添加物料信息',
                  content: 'QualityInformationFrom.html',
                  maxmin: true,
                  area: ['500px', '350px'],
                  area: ['500px', '450px'],
                  btn: ['确定', '取消'],
                  yes: function(index, layero) {
                     var iframeWindow = window['layui-layer-iframe' + index],
@@ -360,7 +360,9 @@
                        //提交 Ajax 成功后，静态更新表格中的数据
                        var param = {                
                           InspectNo: field.InspectNo,        
                           ASNNo: field.ASNNo,        
                           LotNo: field.LotNo,
                           SkuNo: field.SkuNo,
                           IsQualified: field.IsQualified,
                        };
                        if(doing)