From 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 24 六月 2025 09:13:48 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
HTML/views/StatisticalReport/BoxInfor.html | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index dcefb00..4eb09eb 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -205,7 +205,14 @@
<!-- #region 鑷畾涔夎〃澶� -->
<script type="text/html" id="templetProductionTime">
{{# function GetBtn(d){
- return formatDate(d.ProductionTime);
+ return formatDate2(d.ProductionTime);
+ }
+ }}
+ {{ GetBtn(d) }}
+ </script>
+ <script type="text/html" id="templetExpirationTime">
+ {{# function GetBtn(d){
+ return formatDate2(d.ExpirationTime);
}
}}
{{ GetBtn(d) }}
@@ -482,6 +489,7 @@
{ field: 'Qty', title: '鏁伴噺', width: 90, align: 'center' },
{ field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center' },
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈�', align: 'center', templet: '#templetExpirationTime' },
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
{ field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center' },
{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
--
Gitblit v1.8.0