From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/webapp/static/js/locDetlWarning/locDetlWarning.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
index fd5c09a..9b07864 100644
--- a/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
+++ b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
@@ -30,16 +30,16 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {field: 'locNo', align: 'center',title: '搴撲綅'}
- ,{field: 'countAnfme', align: 'center',title: '搴撳瓨鏁伴噺鎬昏'}
- ,{field: 'matnr', align: 'center',title: '搴撳瓨鏍囧彿'}
- ,{field: 'maktx', align: 'center',title: '搴撳瓨鍚嶇О'}
+ {field: 'diffTime', align: 'center',title: '搴撻緞(澶�)'}
+ ,{field: 'inventoryAgeMax', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅'}
+ ,{field: 'matnr', align: 'center',title: '璐х墿缂栧彿'}
+ ,{field: 'maktx', align: 'center',title: '璐х墿鍚嶇О'}
,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'inventoryMax', align: 'center',title: '搴撳瓨涓婇檺'}
- ,{field: 'inventoryMin', align: 'center',title: '搴撳瓨涓嬬嚎'}
- ,{field: 'inventoryAgeMax', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
- ,{field: 'diffTime', align: 'center',title: '搴撻緞(澶�)'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
+ ,{field: 'owner$', align: 'center',title: '璐т富'}
+
]
],
request: {
--
Gitblit v1.9.1