From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/report/workCountOut.js | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..7f1d21f 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
@@ -83,6 +83,7 @@
switch(obj.event) {
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.load(2, {time: 600*1000});
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -91,32 +92,34 @@
fields.push(col.field);
}
});
- var exportData = {};
+ var param = '?';
$.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- fields: fields,
- exportData: exportData
- };
- $.ajax({
- url: baseUrl+"/report/viewWorkOutExport.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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/countOut" + param;
+ layer.closeAll();
+ // var param = {
+ // fields: fields,
+ // exportData: exportData
+ // };
+ // $.ajax({
+ // url: baseUrl+"/report/download/out",
+ // 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;
}
--
Gitblit v1.9.1