From d07f25c163706ac46a83bd2c63db1e3c52715222 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 27 三月 2025 15:54:25 +0800
Subject: [PATCH] 解决问题
---
HTML/views/SOSetting/ExportNotice.html | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index cc00349..9b915e4 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -152,10 +152,9 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="LoadingArea" id="LoadingArea" lay-search>
<option value=""></option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
+ <option value="3">4</option>
+ <option value="2">5</option>
+ <option value="1">6</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,13 +373,13 @@
<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>`;
}
}
- if( d.Status == '4'){
+ if( d.Status == '4' ||d.Status == '3'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs guanClass" lay-event="finish">
<i class="layui-icon layui-icon-ok"></i>鍏冲崟
</a>`;
@@ -898,6 +899,8 @@
}
if($('#UnstackWay').val()=='1'){
$('.DivPickingArea2').show()
+ $('.LoadingArea').hide()
+
}
outFunction(data.SONo)
@@ -1100,7 +1103,9 @@
return;
}
}
+ if(isNeedUnpack == 1){
console.log($("#PickingArea").val())
+ if($('#UnstackWay').val()=='1'){
if($("#PickingArea").val() == '')
{
layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
@@ -1109,7 +1114,7 @@
});
isChongFu= true;
return;
- }
+ }}}
var param = {
soNo: soNo,
unstackingMode:$('#UnstackWay').val(),
--
Gitblit v1.8.0