From aa7c4ba35f1201615c18e47e54899a873eea28d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 08:44:28 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/workOut.js | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index baf0c85..fc2f2d4 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -11,27 +11,27 @@
tableIns = table.render({
elem: '#workOut',
headers: {token: localStorage.getItem('token')},
- url: '/report/viewWorkOutList.action',
+ url: baseUrl+'/report/viewWorkOutList.action',
page: true,
limit: 10,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡', sort: true}
+ ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '璇锋眰缂栧彿'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ // ,{field: 'tbnum', align: 'center',title: '璇锋眰缂栧彿'}
+ // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+ // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+ // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
]],
request: {
pageName: 'curr',
@@ -50,7 +50,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -72,7 +72,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -85,7 +85,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) {
@@ -98,19 +98,18 @@
'fields': fields
};
$.ajax({
- url: "/report/viewWorkOutExport.action",
+ 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) {
- 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)
}
@@ -145,7 +144,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