From 95059b789744cd84e704f0bffa9ded5bc5f47044 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 08 七月 2021 12:45:02 +0800
Subject: [PATCH] 1.平仓日入库支持导出(当前页数据)
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 10 +++++
src/main/webapp/views/locNormal/normalReport.html | 13 ++++--
src/main/webapp/static/js/locNormal/normalReport.js | 40 ++++++++++++++++++++
3 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 914cb9b..36261c9 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -304,4 +304,14 @@
allLike(LocNormalLog.class, param.keySet(), wrapper, condition);
return R.ok(locNormalLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+
+ //excel瀵煎嚭
+ @RequestMapping("/locNomal/normalReportExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R normalReportExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ List<LocNormalReport> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalReport.class);
+ return R.ok(exportSupport(list, fields));
+ }
}
diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 29136ba..12d5274 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -124,6 +124,46 @@
, type: 'datetime'
, range: true
});
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(locNormal)', function (obj) {
+ switch(obj.event) {
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var param = {
+ fields: fields,
+ exportData: locNormalList
+ };
+ $.ajax({
+ url: baseUrl+"/locNomal/normalReportExport.action",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
});
/* 琛ㄦ牸鏁版嵁閲嶈浇 */
diff --git a/src/main/webapp/views/locNormal/normalReport.html b/src/main/webapp/views/locNormal/normalReport.html
index f8d5b5f..5423ccf 100644
--- a/src/main/webapp/views/locNormal/normalReport.html
+++ b/src/main/webapp/views/locNormal/normalReport.html
@@ -89,7 +89,9 @@
.btn-remove {
display: none;
}
-
+ #btn-export {
+ margin-top: 10px;
+ }
</style>
<body>
<div>
@@ -136,9 +138,12 @@
</div>
<!-- 琛ㄦ牸 -->
- <div class="layui-form">
- <table class="layui-hide" id="locNormal" lay-filter="locNormal"></table>
- </div>
+ <table class="layui-hide" id="locNormal" lay-filter="locNormal"></table>
+ <script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
+ </div>
+ </script>
</div>
--
Gitblit v1.9.1