From 80ce0de01bd20da10383704e5abd469cdd492089 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 15:45:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test
---
src/main/webapp/static/js/pakStore/turnOver.js | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index b503792..8d0e95a 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -29,7 +29,19 @@
toolbar: '#toolbar',
cellMinWidth: 50,
limit: 500,
- cols: [getCol()],
+ cols: [[
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+ ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
+ ]],
done: function(res, curr, count) {
tableMerge.render(this);
limit();
@@ -152,7 +164,7 @@
maxmin: false,
area: ['90%', '85%'],
shadeClose: true,
- content: 'turnOverQuery.html',
+ content: 'turnOverOwner.html',
success: function(layero, index){
layer.close(loadIndex);
}
--
Gitblit v1.9.1