From 38d24bdd00d8dd9e416fc5988831ec4b62e696ca Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 06 三月 2024 09:39:30 +0800
Subject: [PATCH] 合并数据

---
 HTML/views/SOSetting/ExportNotice.html |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 5706555..b8e85a1 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -336,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">

--
Gitblit v1.8.0