From 6cd9f18cd85472b5d7ccc0a6e0f6924da4dbd6e5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 25 八月 2021 13:21:30 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/report/workOut.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 035d6b5..b4f4f32 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -90,8 +90,13 @@
fields.push(col.field);
}
});
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
var param = {
- 'fields': fields
+ fields: fields,
+ exportData: exportData
};
$.ajax({
url: baseUrl+"/report/viewWorkOutExport.action",
--
Gitblit v1.9.1