From 3c43878b87e5724585a107fd30080ba8899d7690 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 11 八月 2022 17:19:09 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/webapp/static/js/report/inOut.js | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index add532f..e7dff96 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -17,8 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
- ,{field: 'ymd', align: 'center', title: '鏃ユ湡', sort: true}
+ // {type: 'checkbox'}
+ {field: 'ymd', align: 'center', title: '鏃ユ湡'}
,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
@@ -41,7 +41,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -63,7 +63,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -76,7 +76,7 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -96,12 +96,11 @@
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
- console.log(res);
layer.closeAll();
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -136,7 +135,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1