Merge branch 'yyk'

yuyou_x

2024-02-05 b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9

 HTML/views/WareHouseSetting/LocateFrom.html

@@ -65,7 +65,7 @@
         <div class="layui-form-item">
            <label class="layui-form-label">所属区域</label>
            <div class="layui-input-inline">
               <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search disabled="">
               <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
                  <option value=""></option>
               </select>
            </div>
@@ -143,8 +143,14 @@
               layer = layui.layer;

            var id = getQueryString('id');
            var no = getQueryString('WareHouseNo');
            var param = {
               Id: parseInt(id)
            }
            console.log(no)
            if(no != null)
            {
               GetArea('',no)
            }
            if(getQueryString('id') != null)
            {
@@ -152,7 +158,7 @@
                  if (res.code == 0) { 
                     // $("input[name=Id]").val(res.data.Id);
                     GetHouse(res.data.WareHouseNo)
                     GetArea(res.data.AreaNo)
                     GetArea(res.data.AreaNo,res.data.WareHouseNo)
                     GetRoadway(res.data.RoadwayNo)
                     GetTemp(res.data.Temperature);
                     $("input[name=Row]").val(res.data.Row);
@@ -196,9 +202,14 @@
               });
            }
            //获取区域
            function GetArea(val){  
               sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=", {}, 'get', function(res) {
						
            function GetArea(val,wareHouse){ 
               var a = $("#WareHouseNo").val();
               if (wareHouse != null)
               {
                  a = wareHouse;
               } 
               sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+a, {}, 'get', function(res) {
                  console.log(res)
                  if (res.code == 0) { //成功
                     $("#AreaNo").empty(); 
                     for (var i = 0; i < res.data.length; i++) {