托盘明细增加所属仓库、区域查询条件

bklLiudl

1 天以前 5cd857c91bd49e276274f6df6b9a126febfbf978

 HTML/views/StatisticalReport/BoxInfor.html

@@ -153,6 +153,23 @@
                     <input type="text" autocomplete="off" id="EndTime" class="layui-input" placeholder="结束时间">
                  </div>
               </div>
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">所属仓库</label>
                  <div class="layui-input-inline">
                     <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
                        <option value=""></option>
                     </select>
                  </div>
               </div>
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">所属区域</label>
                  <div class="layui-input-inline">
                     <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
                        <option value=""></option>
                     </select>
                  </div>
               </div>


               <div class="layui-inline sousuo">
                  <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
@@ -401,7 +418,7 @@
         //#endregion
         //获取托盘明细
         function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
            BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime) {
            BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo) {
            //#region 自定义表头
            var colsJson
            var param1 = {
@@ -448,6 +465,8 @@
                  OwnerName: OwnerName, //货主名称
                  StartTime: StartTime, //开始时间
                  EndTime: EndTime, //结束时间
                  WareHouseNo: WareHouseNo,
                  AreaNo: AreaNo,
               };
               sendData(IP + "/Statistical/GetBindList", param, 'get', function (res) {
                  console.log(res)
@@ -498,7 +517,8 @@
         ]];
         var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
         //#endregion            
         function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime) {
         function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus,
            StartTime, EndTime, WareHouseNo, AreaNo) {
            //#region 自定义表头
            var colsJson2
            var param1 = {
@@ -543,6 +563,8 @@
                  InspectStatu: InspectStatus,
                  StartTime: StartTime,
                  EndTime: EndTime,
                  WareHouseNo: WareHouseNo,
                  AreaNo: AreaNo,
               }
               sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function (res) {
                  if (res.code == 0) //成功
@@ -593,14 +615,18 @@

            var StartTime = $("#StartTime").val();
            var EndTime = $("#EndTime").val();
            var WareHouseNo = $("#WareHouseNo").val();
            var AreaNo = $("#AreaNo").val();

            if (yemianid == 0) {
               console.log("总单");
               refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
               refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark,
                  InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo);
            } else if (yemianid == 1) {
               quanid = '';
               console.log("明细");
               refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
               refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark,
                  InspectStatus, StartTime, EndTime, WareHouseNo, AreaNo);
            }

         });
@@ -760,6 +786,52 @@

         });


         //获取仓库下拉框信息
         sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
            if (res.code == 0) { //成功
               for (var i = 0; i < res.data.length; i++) {
                  $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                     res.data[i].WareHouseName + '</option>');
               }
               form.render('select');
            } else { //不成功
               layer.msg(res.msg, {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }, function () { });
            }
         });

         getAR("");
         form.on('select(getWareHouseNo)', function (data) {
            console.log(data);
            getAR(data.value);
         });
         function getAR(val) {
            //获取 区域下拉框
            sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
               $("#AreaNo").empty();
               $("#AreaNo").append('<option value =""></option>');
               if (res.code == 0) { //成功 
                  for (var i = 0; i < res.data.length; i++) {
                     $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
                        res.data[i].AreaName + '</option>');
                  }
                  form.render('select');
               } else { //不成功
                  layer.msg('获取区域信息失败', {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  }, function () {
                     //回调
                     form.render('select');
                  });
               }
            });

         };

         //#region 自定义表头
         //自定义表头         
         active = {