From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/static/js/report/workIn.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 2ca190e..f0c2b43 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,6 +3,9 @@
var cols = [
{field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'floor', align: 'center',title: '妤煎眰'}
+ ,{field: 'loc_type1$', align: 'center',title: '搴撲綅绫诲瀷'}
+
];
cols.push.apply(cols, detlCols);
return cols;
@@ -92,6 +95,7 @@
$.each($('#search-box [name]').serializeArray(), function() {
param += this.name + '=' + this.value + '&';
});
+ console.log(param);
window.location.href = baseUrl + "/report/download/in" + param;
layer.closeAll();
// var exportData = {};
--
Gitblit v1.9.1