Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

 HTML/views/StatisticalReport/BoxInfor.html

@@ -52,6 +52,20 @@
                     </div>
                  </div>
                  <div class="layui-inline mingxi">
                     <label class="layui-form-label" style="width: 60px;">货主编码</label>
                     <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                        <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                           class="layui-input">
                     </div>
                  </div>
                  <div class="layui-inline mingxi">
                     <label class="layui-form-label" style="width: 60px;">货主名称</label>
                     <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                        <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                           class="layui-input">
                     </div>
                  </div>
                  <div class="layui-inline mingxi">
                     <label class="layui-form-label" style="width: 60px;">批次号</label>
                     <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                        <input type="text" id="LotNo"  name="LotNo" placeholder="批次号" autocomplete="off" class="layui-input">
@@ -303,7 +317,7 @@

            var $ = layui.$;
            var yemianid =0;
            refreshTable("","","","","","","","","","");
            refreshTable("","","","","","","","","","","","");

            // 表单需要的变量
            var infoOptions;
@@ -378,6 +392,8 @@
                    {field: 'PalletNo', title: '托盘号', align: 'center'},
                    {field: 'SkuNo', title: '物料编码', align: 'center'},
                    {field: 'SkuName', title: '物料名称', align: 'center'},
               {field: 'OwnerNo',title: '货主编码',align: 'center'},
               {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    {field: 'SupplierLot', title: '供货批次', align: 'center'},
@@ -390,7 +406,7 @@
            var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            //#endregion
            //获取托盘明细
                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus) {
                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName) {
               //#region 自定义表头
               var colsJson
               var param1={
@@ -432,7 +448,9 @@
                     InspectMark:InspectMark, //检验标记
                     BitPalletMark:BitPalletMark, //零托标记
                     BitBoxMark:BitBoxMark, //零箱标记
                     InspectStatus:InspectStatus //质量状态
                     InspectStatus:InspectStatus, //质量状态
                     OwnerNo:OwnerNo, //货主编码
                     OwnerName:OwnerName //货主名称
                  };
                  sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) { 
                     console.log(res)                       
@@ -639,9 +657,12 @@
               var BitBoxMark = $("#BitBoxMark").val();
               var InspectStatus = $("#InspectStatus").val();

               var OwnerNo = $("#OwnerNo").val();
               var OwnerName = $("#OwnerName").val();

               if(yemianid == 0){
                  console.log("总单");
                  refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus);
                  refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
               }else if(yemianid == 1){
                  quanid = '';
                  console.log("明细");
@@ -667,7 +688,7 @@
               yemianid = data.index
               if(yemianid == 0){
                  console.log("总单");
                  refreshTable("","","","","","","","","","");
                  refreshTable("","","","","","","","","","","","");
               }else if(yemianid == 1){
                  console.log("明细");
                  refreshTable2(quanid);