Merge branch 'master' into wxw

Administrator

2024-02-23 6506264a5436e610ae655c2f86c593108085059a

 HTML/views/ASNSetting/PalletBind.html

@@ -64,45 +64,23 @@
               <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="ImportExecuteFlag" lay-search>
                     <select name="WareHouseNo" id="WareHouseNo"  lay-filter="getWareHouseNo" lay-search>
                        <option value=""></option>
                        <option value="W01">力诺立体库</option>
                        <option value="W02">力诺平库</option>
                     </select>
                  </div>
               </div>
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">所属巷道</label>
                  <div class="layui-input-inline">
                     <select name="RoadwayNo" id="RoadwayNo" lay-filter="ImportExecuteFlag" lay-search>
                     <select name="RoadwayNo" id="RoadwayNo" lay-search>
                        <option value=""></option>
                        <option value="R01">01巷道</option>
                        <option value="R02">02巷道</option>
                        <option value="R03">03巷道</option>
                        <option value="R04">04巷道</option>
                        <option value="R05">05巷道</option>
                        <option value="R06">06巷道</option>
                        <option value="R07">07巷道</option>
                        <option value="R08">08巷道</option>
                        <option value="R09">09巷道</option>
                        <option value="R10">10巷道</option>
                        <option value="R11">11巷道</option>
                        <option value="R12">12巷道</option>
                        <option value="R13">13巷道</option>
                        <option value="R14">14巷道</option>
                        <option value="R15">15巷道</option>
                        <option value="R16">16巷道</option>
                        <option value="R17">17巷道</option>
                        <option value="R18">18巷道</option>
                        <option value="R19">19巷道</option>
                        <option value="R20">20巷道</option>
                     </select>
                  </div>
               </div>
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">执行状态</label>
                  <div class="layui-input-inline">
                     <select name="Status" id="Status" lay-filter="ImportExecuteFlag" lay-search>
                     <select name="Status" id="Status" lay-search>
                        <option value=""></option>
                        <option value="0">等待执行</option>
                        <option value="1">入库中</option>
@@ -366,16 +344,6 @@
                     case "R08": return '08巷道';
                     case "R09": return '09巷道';
                     case "R10": return '10巷道';
                     case "R11": return '11巷道';
                     case "R12": return '12巷道';
                     case "R13": return '13巷道';
                     case "R14": return '14巷道';
                     case "R15": return '15巷道';
                     case "R16": return '16巷道';
                     case "R17": return '17巷道';
                     case "R18": return '18巷道';
                     case "R19": return '19巷道';
                     case "R20": return '20巷道';
                     default: return "";
                  }
                  
@@ -427,7 +395,55 @@

         bindPalletBind();
         bindBoxInfo("0");
			

         //获取仓库下拉框信息
         synData(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>');
               }
               // $("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
               form.render('select');
            } else { //不成功
               layer.msg(res.msg, {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }, function () { });
            }
         });

         // 查询事件
         form.on('select(getWareHouseNo)', function (data) {
            if($("#WareHouseNo").val() == "W01")
            {
               //获取巷道下拉框信息
               synData(IP + "/Sys/GetRoadwayList", {}, 'get', function (res) {
                  if (res.code == 0) { //成功
                     for (var i = 0; i < res.data.length; i++) {

                        $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
                           res.data[i].RoadwayName + '</option>');
                     }
                     // $("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
                     form.render('select');
                  } else { //不成功
                     layer.msg(res.msg, {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                     }, function () { });
                  }
               });
            }
            else
            {
               $("#RoadwayNo").html('');
               $("#RoadwayNo").append('<option value=""></option>');
               form.render('select');
            }
				
         });

         // 渲染总表
         //#region 自定义表头