From e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 07 三月 2024 11:25:38 +0800
Subject: [PATCH] 合并代码
---
HTML/views/SOSetting/ExportNotice.html | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index d9708df..bb7e808 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/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: '纭鍑哄簱鍙�',
@@ -1383,10 +1386,11 @@
isChongFu= false;
if(pa == null)
{
- layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ isChongFu= true;
return;
}
if($('#UnstackWay').val()=='0'){
@@ -1395,6 +1399,21 @@
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;
+ }
+ isChongFu= true;
return;
}
if(isNeedUnpack=='1'){
@@ -1403,6 +1422,7 @@
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ isChongFu= true;
return;
}
}
@@ -1412,11 +1432,12 @@
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 +1570,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()
}
});
--
Gitblit v1.8.0