From e589ffc0b6009b3c69bb356a9ed102773cfb8474 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 02 十一月 2024 10:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/webapp/static/js/locDetl/locDetl.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 211c380..90e8841 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,14 +1,15 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
--
Gitblit v1.9.1