From 1401f0156b5338a110f1d3a803a3c09c134b7e0d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 23 三月 2024 16:53:02 +0800
Subject: [PATCH] Merge branch 'wxw'

---
 HTML/views/SOSetting/ExportAllot.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 214848d..24dfb71 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -284,7 +284,7 @@
 				<script type="text/html" id="table-content-list2">
 					{{# function GetBtn2(d){
 							var html = '';
-							if(d.SkuNo != "100099"){
+							if(d.SkuNo != "100099" && d.BoxNo != ''){
 								html =`<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sel"> 
 									<i class="layui-icon layui-icon-edit"></i>璇︽儏</a>`;
 							} 
@@ -615,7 +615,7 @@
 				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
 				{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 110, },
 				{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 120, },
-				{field: 'CreateTime',align: 'center',title: '鎷h揣',width: 165,templet: '#templetCreateTime2'}, 
+				//{field: 'CreateTime',align: 'center',title: '鎷h揣鏃堕棿',width: 165,templet: '#templetCreateTime2'}, 
 				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
 			]];
 			var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜

--
Gitblit v1.8.0