Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

11 小时以前 98e221d6dc26183efab868ee5f11a65d5791304e

 HTML/views/SOSetting/PalletNoOut.html

@@ -88,13 +88,7 @@
                     <div class="layui-input-inline">
                        <select name="PickingArea" id="PickingArea" lay-search>
                           <option value=""></option>
                           <option value="B020101">一楼-1</option>
                           <option value="B020102">一楼-2</option>
                           <option value="B020103">一楼-3</option>
                           <option value="B020104">一楼-4</option>
                           <option value="B050101">二楼-1</option>
                           <option value="B050102">二楼-2</option>
                           <option value="B050103">二楼-3</option>
									
                        </select>
                     </div>
                  </div>
@@ -405,8 +399,17 @@
             //监听数据操作
            table.on('tool(LAY-app-content-list)', function(obj) {
               var data = obj.data; 
					 
		
               if(obj.event === 'outKu'){
                  $("#PickingArea").empty();
                  $("#PickingArea").append('<option value =""></option>');
                  if(data.WareHouseNo=='W02'){
                     $("#PickingArea").append('<option value ="B020101">一楼-1</option><option value ="B020102">一楼-2</option><option value ="B020103">一楼-3</option><option value="B020104">一楼-4</option><option value="B050101">二楼-1</option><option value="B050102">二楼-2</option><option value="B050103">二楼-3</option>');
                  }else if(data.WareHouseNo=='W01'){
                     $("#PickingArea").append('<option value="17">17工位</option><option value="18">18工位</option>');
                  }
                  form.render('select');

                  layer.open({
                     type: 1,
                     title: '确认出库口',