From 46c887694fdde580355014847da7e39b4ab301cc Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 05 三月 2024 15:37:25 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/SOSetting/ExportNotice.html | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index c463ff8..b8e85a1 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -66,6 +66,7 @@
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
@@ -90,7 +91,7 @@
<option value="3">姝ｅ湪鎵ц</option>
<option value="4">鎵ц瀹屾瘯</option>
<option value="5">璁㈠崟鍏抽棴</option>
- <option value="6">宸插鏍�</option>
+ <option value="6">涓婁紶瀹屾瘯</option>
</select>
</div>
</div>
@@ -142,7 +143,7 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
<option value="0" selected>鏈哄櫒浜烘媶鍨�</option>
- <option value="1">浜哄伐鎷嗗灈</option>
+ <option value="1">PDA鎷嗗灈</option>
</select>
</div>
</div>
@@ -212,6 +213,8 @@
return "浠ｅ偍鍑哄簱";
case "7":
return "鍏朵粬鍑哄簱";
+ case "8":
+ return "瀵勫瓨鍑哄簱";
default:
return "";
}
@@ -333,9 +336,11 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
- <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
- </a>`;
+ if(d.Type != "8") {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
+ <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
+ </a>`;
+ }
}
if(d.Status == '0' && d.Origin == 'WMS'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
@@ -362,11 +367,13 @@
</a>`;
}
if( d.Status == '5'){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check">
<i class="layui-icon layui-icon-ok"></i>澶嶆牳
</a>`;
}
-
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml">
+ <i class="layui-icon layui-icon-ok"></i>XML
+ </a>`;
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
<i class="layui-icon layui-icon-edit"></i>澶囨敞</a>`;
return html;
@@ -1135,7 +1142,7 @@
var param = {
Id: parseInt(Id),
};
- sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function(res) {
+ sendData(IP + "/UpApi/CloseExportNotice", param, 'post', function(res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
@@ -1219,7 +1226,11 @@
maxmin: true,
area: ['1200px', '90%'],
});
- }else if(obj.event === 'outKu'){
+ }else if(obj.event === 'outKu'){
+ $("#UnstackWay option[value='0']").attr("selected","selected");
+ $("#LoadingArea option[value='']").attr("selected","selected");
+ $("#PickingArea option[value='']").attr("selected","selected");
+ form.render('select');
var param = {
soNo: SoNo
};
@@ -1227,13 +1238,13 @@
if (res.code == 0) { //鎴愬姛
if(res.data=="1"){
isNeedUnpack='1'
- $('.DivPickingArea2').attr("style", "display:block")
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
}else{
isNeedUnpack='0'
- $('.DivPickingArea2').attr("style", "display:none")
+ $('.DivPickingArea2').hide()//.attr("style", "display:none")
}
if($('#UnstackWay').val()=='1'){
- $('.DivPickingArea2').attr("style", "display:block")
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
}
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -1265,7 +1276,9 @@
}
var param = {
soNo: data.SONo,
+ unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ loadingAddre:$('#LoadingArea').val()
};
console.log(param);
sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
@@ -1369,6 +1382,29 @@
});
}
});
+ }else if(obj.event === 'check'){//澶嶆牳
+ // 浠ｇ爜鍖哄煙
+ layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function(index) {
+ var param = {
+ Id:data.Id,
+ };
+ sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true });
+ }
+ });
+ });
}
});
@@ -1467,15 +1503,15 @@
form.on('select(UnstackWay)',function(data){
var value = data.value;
if(value==0){
- $('.DivLoadingArea').attr("style", "display:block")
+ $('.DivLoadingArea').show()//.attr("style", "display:block")
if(isNeedUnpack=='0'){
- $('.DivPickingArea2').attr("style", "display:none")
+ $('.DivPickingArea2').hide()//.attr("style", "display:none")
}else{
- $('.DivPickingArea2').attr("style", "display:block")
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
}
}else{
- $('.DivLoadingArea').attr("style", "display:none")
- $('.DivPickingArea2').attr("style", "display:block")
+ $('.DivLoadingArea').hide()//.attr("style", "display:none")
+ $('.DivPickingArea2').show()//.attr("style", "display:block")
}
});
--
Gitblit v1.8.0