From 1b13c69e4e2bb00bea4e90232a78715d49f1e24f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:38:14 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/workOut.js | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 49a03e0..b4f4f32 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -30,8 +30,8 @@
cellMinWidth: 50,
cols: [getCol()],
request: {
- pageName: 'curr',
- pageSize: 'limit'
+ pageName: 'pageNumber',
+ limitName: 'pageSize'
},
parseData: function (res) {
return {
@@ -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",
@@ -121,6 +126,19 @@
pageCurr = 1;
tableReload(false);
});
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1