Merge branch 'master' into Liudl

bklLiudl

2024-03-19 16ae0857633ee15170ed63d3e22c380a9350148c

 HTML/views/SOSetting/ExportNotice.html

@@ -1227,9 +1227,13 @@
                     maxmin: true,
                     area: ['1200px', '90%'],
                  });
               }else if(obj.event === 'outKu'){	
                  $("#UnstackWay option[value='0']").attr("selected","selected");
                  $("#UnstackWay").attr("disabled",false);						
               }else if(obj.event === 'outKu'){
                  $("#UnstackWay").val(0)
                  $("#UnstackWay").attr("disabled",false);	
                  $("#LoadingArea").val('')
                  $("#PickingArea").val('')
                  $('.DivLoadingArea').show()	
                  form.render('select'); 				
                  var param = {
                     soNo: SoNo
                  };
@@ -1247,9 +1251,8 @@
                           if($('#UnstackWay').val()=='1'){
                              $('.DivPickingArea2').show()
                           }                              
									
                           form.render('select'); 					
                           outFunction()
											
                           outFunction(data.SONo)
                        } else { //不成功
                           layer.msg(res.msg, {
                              icon: 2,
@@ -1260,13 +1263,13 @@
                        }
                     });
                  }else{
                     $("#UnstackWay option[value='1']").attr("selected","selected");
                     $("#UnstackWay").val(1)
                     $("#UnstackWay").attr("disabled",true);
                     form.render('select');    
                     
                     $('.DivLoadingArea').hide()

                     outFunction()
                     outFunction(data.SONo)
                  }
                  
                  
@@ -1368,7 +1371,7 @@
            });
            
            //选择出库口弹窗方法
            function outFunction(){
            function outFunction(soNo){
               layer.open({
                  type: 1,
                  title: '确认出库口',
@@ -1395,28 +1398,22 @@
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              return;
                           }
                           if(isNeedUnpack=='1'){
                              if(pa==''){
                                 layer.msg("请选择出库口", {
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                 });
                                 return;
                              }
                           }
                        }else{
                           if(pa==''){
                              layer.msg("请选择出库口", {
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              isChongFu= true;
                              return;
                           }
                        }
                        console.log($("#PickingArea").val())
                        if($("#PickingArea").val() == '')
                        {
                           layer.msg("请选择出库口", {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           });
                           isChongFu= true;
                           return;
                        }
                        var param = {
                           soNo: data.SONo, 
                           soNo: soNo, 
                           unstackingMode:$('#UnstackWay').val(),
                           outMode: pa,
                           loadingAddre:$('#LoadingArea').val()
@@ -1549,15 +1546,15 @@
            form.on('select(UnstackWay)',function(data){
               var value = data.value;
               if(value==0){
                  $('.DivLoadingArea').show()//.attr("style", "display:block")
                  $('.DivLoadingArea').show()
                  if(isNeedUnpack=='0'){
                     $('.DivPickingArea2').hide()//.attr("style", "display:none")
                     $('.DivPickingArea2').hide()
                  }else{
                     $('.DivPickingArea2').show()//.attr("style", "display:block")
                     $('.DivPickingArea2').show()
                  }                  
               }else{                  
                  $('.DivLoadingArea').hide()//.attr("style", "display:none")
                  $('.DivPickingArea2').show()//.attr("style", "display:block")					
                  $('.DivLoadingArea').hide()
                  $('.DivPickingArea2').show()				
               }             
            });