From 4807619ff7d8721f4286ad8d62369b70dc929cd4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 08 七月 2021 13:01:05 +0800
Subject: [PATCH] 1.立库日出入库统计导出支持分页导出 2.平仓日入库查询支持分页导出
---
src/main/webapp/static/js/report/workOut.js | 7 +++++--
src/main/webapp/static/js/report/workIn.js | 7 +++++--
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index ef24c44..c22aa6e 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -158,6 +158,16 @@
return R.ok(exportSupport(list, fields));
}
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExportByPage.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�(鍒嗛〉鏁版嵁)")
+ public R viewWorkInExportByPage(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ List<ViewWorkInBean> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), ViewWorkInBean.class);
+ return R.ok(exportSupport(list, fields));
+ }
+
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkOutList.action")
public R viewWorkOutList(ViewWorkInBean bean){
@@ -181,4 +191,14 @@
return R.ok(exportSupport(list, fields));
}
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExportByPage.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�(鍒嗛〉鏁版嵁)")
+ public R viewWorkOutExportByPage(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ List<ViewWorkInBean> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), ViewWorkInBean.class);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 367d367..c648ce8 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,4 +1,5 @@
var pageCurr;
+var workInData = [];
function getCol() {
var cols = [
{field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
@@ -48,6 +49,8 @@
}
pageCurr=curr;
limit();
+ // 鍒嗛〉鏁版嵁涓存椂瀛樺偍
+ workInData = res.data;
}
});
@@ -94,10 +97,10 @@
});
var param = {
fields: fields,
- exportData: exportData
+ exportData: workInData
};
$.ajax({
- url: baseUrl+"/report/viewWorkInExport.action",
+ url: baseUrl+"/report/viewWorkInExportByPage.action",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index b4f4f32..5697abf 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -1,4 +1,5 @@
var pageCurr;
+var workOutData = [];
function getCol() {
var cols = [
{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
@@ -50,6 +51,8 @@
}
pageCurr=curr;
limit();
+ // 鍒嗛〉鏁版嵁涓存椂瀛樺偍
+ workOutData = res.data;
}
});
@@ -96,10 +99,10 @@
});
var param = {
fields: fields,
- exportData: exportData
+ exportData: workOutData
};
$.ajax({
- url: baseUrl+"/report/viewWorkOutExport.action",
+ url: baseUrl+"/report/viewWorkOutExportByPage.action",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
--
Gitblit v1.9.1