Merge branch 'master' into wxw

Administrator

2024-02-21 87d55df7b7446d7c4c3532a2dd2e78f72574e34b

 HTML/views/ASNSetting/PalletBind.html

@@ -62,22 +62,40 @@
                  </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="ImportExecuteFlag" 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>
                        <option value=""></option>
                        <option value="R01">01巷道</option>
                        <option value="R02">02巷道</option>
                     </select>
                  </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="ImportExecuteFlag" lay-search>
                        <option value=""></option>
                        <option value="W01">09仓库</option>
                        <option value="W02">09零箱库</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>
@@ -340,6 +358,24 @@
                  switch (d.RoadwayNo) {
                     case "R01": return '01巷道';
                     case "R02": return '02巷道';
                     case "R03": return '03巷道';
                     case "R04": return '04巷道';
                     case "R05": return '05巷道';
                     case "R06": return '06巷道';
                     case "R07": return '07巷道';
                     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 "";
                  }