Merge branch 'yyk'

yuyou_x

2024-02-05 b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9

 HTML/views/WareHouseSetting/Locate.html

@@ -157,10 +157,41 @@
                  if (checkData.length === 0) {
                     return layer.msg('请选择数据');
                  }
                  else if(checkData.length > 1)
                  {
                     var li = 0;
                     var ping = 0;
                     var WareNo = "W01";
                     checkData.forEach(item => {
                        if (item.WareHouseName == "力诺立体库")
                        {
                           li += 1;
                           WareNo = "W01";
                           if (ping > 0)
                           {
                              return;
                           }
                        }
                        if (item.WareHouseName == "力诺平库")
                        {
                           ping += 1;
                           WareNo = "W02";
                           if (li > 0)
                           {
                              return;
                           }
                        }
                     });
                     if (li != 0 && ping != 0)
                     {
                        return layer.msg('请勿选择多种仓库！');
                     }
                  }
						
                  layer.open({
                     type: 2,
                     title: '编辑储位状态集合',
                     content: 'LocateFrom.html',
                     content: 'LocateFrom.html?WareHouseNo='+WareNo,
                     maxmin: true,
                     area: ['560px', '510px'],
                     btn: ['确定', '取消'],
@@ -490,7 +521,7 @@
                  $("#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].WareHouseNo + '-' +
                        $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
                           res.data[i].AreaName + '</option>');
                     }
                     form.render('select');