From c5dc821692c0529e3a688af84c647bf80cc49360 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 10:49:40 +0800
Subject: [PATCH] Merge branch 'master' into djp
---
HTML/views/StatisticalReport/AdventSlot.html | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/HTML/views/StatisticalReport/AdventSlot.html b/HTML/views/StatisticalReport/AdventSlot.html
index d843642..c61edb9 100644
--- a/HTML/views/StatisticalReport/AdventSlot.html
+++ b/HTML/views/StatisticalReport/AdventSlot.html
@@ -121,6 +121,13 @@
}}
{{ GetBtn(d) }}
</script>
+ <script type="text/html" id="templetExpirationTime">
+ {{# function GetBtn(d){
+ return formatDate(d.ExpirationTime);
+ }
+ }}
+ {{GetBtn(d)}}
+ </script>
<!-- #endregion -->
</div>
@@ -277,6 +284,12 @@
// },
// },
// {
+ // field: 'ExpirationTime', title: '杩囨湡鏃堕棿', align: 'center',width:150,
+ // templet: function(d) {
+ // return formatDate2(d.ExpirationTime);
+ // },
+ // },
+ // {
// field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'
// },
// {
@@ -308,11 +321,13 @@
{field: 'LotText',title: '鎵规鎻忚堪', align: 'center', width:100},
{field: 'SupplierLot',title: '渚涜揣鎵规', align: 'center', width:100},
{field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center',width:150,templet: '#templetProductionTime'},
+ {field: 'ExpirationTime', title: '杩囨湡鏃堕棿', align: 'center',width:150,templet: '#templetExpirationTime'},
{field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'},
{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center',width:100, templet: '#InspectMarkStatus'},
{field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center',width:100, templet: '#InspectStatus1'},
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ console.log(TotalColsSysArr);
//#endregion
//鑾峰彇鎬婚噺淇℃伅
function refreshTable(SkuNo,SkuName,LotNo,PalletNo,Status,InspectMark,InspectStatus,IsBale,IsBelt) {
--
Gitblit v1.8.0