From ff0b0e8c7a59f44a8abe0ec209130fa525cf5b1c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 09 九月 2024 13:31:49 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js b/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
index 7fa12ef..20fe80d 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'stayTime', align: 'center',title: '婊炵暀澶╂暟'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -78,6 +78,10 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(stayTime)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
switch(obj.event) {
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
@@ -90,7 +94,8 @@
}
});
var param = {
- 'fields': fields
+ 'fields': fields,
+ 'exportData': searchData
};
$.ajax({
url: baseUrl+"/report/viewStayTimeExport.action",
--
Gitblit v1.9.1