From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求

---
 HTML/views/SOSetting/ExportNotice.html |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index cc00349..8bf72a2 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -155,7 +155,6 @@
 										<option value="1">1</option>
 										<option value="2">2</option>
 										<option value="3">3</option>
-										<option value="4">4</option>
 									</select>
 								</div>
 							</div>							
@@ -169,6 +168,8 @@
 										<option value="044">044</option>
 										<option value="051">051</option>
 										<option value="059">059</option>
+										<option value="440">440</option>
+										<option value="443">443</option>
 									</select>
 								</div>
 							</div>
@@ -184,7 +185,7 @@
 							<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
 								<label class="layui-form-label">瀵嗙爜</label>
 								<div class="layui-input-inline" style="width: 220px;">
-									<input type="text" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
+									<input type="password" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
 									class="layui-input">
 								</div>
 							</div>
@@ -372,7 +373,7 @@
 													<i class="layui-icon layui-icon-delete"></i>鍙栨秷鍒嗛厤
 												</a>`;
 									}
-									if( d.Status == '2' || d.Status == '3'){
+									if( d.Status == '1' ||d.Status == '2' || d.Status == '3'|| (d.Status == '4' && d.Type == "1")){
 										html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
 													<i class="layui-icon layui-icon-ok"></i>鍑哄簱
 												</a>`;
@@ -1100,6 +1101,7 @@
 										return;
 									}
 								}
+								if(isNeedUnpack == 1){
 								console.log($("#PickingArea").val())
 								if($("#PickingArea").val() == '')
 								{
@@ -1109,7 +1111,7 @@
 									});
 									isChongFu= true;
 									return;
-								}
+								}}
 								var param = {
 									soNo: soNo, 
 									unstackingMode:$('#UnstackWay').val(),

--
Gitblit v1.8.0