From 1459bff44fdebf9d909a1ce1623ea182171909fe Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 19 六月 2025 10:38:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
HTML/views/StatisticalReport/BoxInfor.html | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 04858a6..dcefb00 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -225,7 +225,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>
@@ -349,27 +363,32 @@
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
{ field: '', title: '搴忓彿', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
- { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center' },
- { field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center' },
- { field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center' },
- { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center' },
- { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center' },
- { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
- { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
- { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
- { field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center' },
- { field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center' },
- { field: 'LotNo', title: '鎵规鍙�', align: 'center' },
- { field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
- { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
- { field: 'Qty', title: '鏁伴噺', align: 'center' },
- { field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', },
- { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center' },
- { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center' , width: 120,},
+ { field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center', width: 120, },
+ { field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center', width: 120, },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100, },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center' , width: 100,},
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' , width: 120,},
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 120,},
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center' , width: 100,},
+ //{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' , width: 120,},
+ { field: 'Qty', title: '鏁伴噺', align: 'center' ,width: 90,},
+ { 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,},
+
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
- { field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
- { field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus' },
+ { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' , width: 100,},
+ { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' , width: 100,},
+ { field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center' , width: 100,},
+ { field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center' , width: 100,},
+
+
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
--
Gitblit v1.8.0