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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 8299035..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>
@@ -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">
@@ -1223,6 +1228,8 @@
});
}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
@@ -1269,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) {
--
Gitblit v1.8.0