From 265fa2b9f6816f62fffac3db611fcb1fc9dfe1a6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 17 十月 2024 18:47:53 +0800
Subject: [PATCH] 修改问题

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

diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 5b4f906..846a008 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -164,10 +164,11 @@
 								<div class="layui-input-inline" style="width: 220px;">
 									<select name="PickingArea" id="PickingArea" 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="033">033</option>
+										<option value="039">039</option>
+										<option value="044">044</option>
+										<option value="051">051</option>
+										<option value="059">059</option>
 									</select>
 								</div>
 							</div>
@@ -336,7 +337,7 @@
 								var html = ''; 
 								if(d.IsWave == '0'){
 									if(d.Status == '0' || d.Status == '1' ){
-										if(d.Type != "8") {
+										if(d.Type != "8" && d.Type != "2" && d.Type != "3") {
 											html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto"> 
 												<i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
 											</a>`;
@@ -386,7 +387,11 @@
 					<script type="text/html" id="table-content-list2">
 						{{# function GetBtn2(d){
 								var html = '';
-								
+								if((d.StatusZ == "2" || d.StatusZ == "3"|| d.StatusZ == "4") && (d.Type == "1" || d.Type == "2" || d.Type == "3") && d.IsWave == "0"){
+									html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
+										<i class="layui-icon layui-icon-ok"></i>鎵嬪姩鍒嗛厤
+									</a>`;
+								}
 								if((d.Status == "0" ||d.Status == "1") && d.Qty > d.AllotQty && d.IsWave == "0"){ 
 									html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
 												<i class="layui-icon layui-icon-ok"></i>鎵嬪姩鍒嗛厤

--
Gitblit v1.8.0