From c9fe2c53364abe0e0e495a1b756267f865159e2e Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 25 六月 2025 12:17:26 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/StatisticalReport/BoxInfor.html | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 24a9b54..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) }}
@@ -225,7 +232,21 @@
</div>
</div>
-
+ <script type="text/html" id="buttonTpl">
+ {{# if(d.Status=='0'){ }}
+ <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭垎閰�</button>
+ {{# } else if(d.Status == '1') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">閮ㄥ垎鍒嗛厤</button>
+ {{# } else if(d.Status == '2') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">宸插垎閰�</button>
+ {{# } else if(d.Status == '3') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">鐩樼偣閿佸畾</button>
+ {{# } else if(d.Status == '4') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">绉诲簱閿佸畾</button>
+ {{# } else if(d.Status == '5') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger">寮傚父閿佸畾</button>
+ {{# } }}
+ </script>
<script type="text/html" id="BoxStatus">
{{# if(d.Status=='0'){ }}
<p>鏈粍鎵�</p>
@@ -363,6 +384,7 @@
{ field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',width: 90, },
{ field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center',width: 90, },
+ { field: 'Status', title: '搴撳瓨鐘舵��', align: 'center', templet: '#buttonTpl', width: 90, },
{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' ,width: 100,},
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' ,width: 100,},
{ field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus',width: 100,},
@@ -467,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