From 940cab832331ab054d2a4c74f13aacc6847dd79d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 08:43:26 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/static/js/report/workOut.js | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index baf0c85..5074519 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -1,4 +1,15 @@
var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
+ ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+}
+
layui.use(['table','laydate', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
@@ -11,31 +22,16 @@
tableIns = table.render({
elem: '#workOut',
headers: {token: localStorage.getItem('token')},
- url: '/report/viewWorkOutList.action',
+ url: baseUrl+'/report/viewWorkOutList.action',
page: true,
- limit: 10,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [[
- {type: 'checkbox'}
- ,{field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡', sort: true}
- ,{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: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ]],
+ cols: [getCol()],
request: {
- pageName: 'curr',
- pageSize: 'limit'
+ pageName: 'pageNumber',
+ limitName: 'pageSize'
},
parseData: function (res) {
return {
@@ -50,7 +46,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -72,7 +68,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -85,7 +81,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) {
@@ -94,28 +90,38 @@
fields.push(col.field);
}
});
- var param = {
- 'fields': fields
- };
- $.ajax({
- url: "/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 = "/";
- } else {
- layer.msg(res.msg)
- }
- }
+ var param = '?';
+ $.each($('#search-box [name]').serializeArray(), function() {
+ param += this.name + '=' + this.value + '&';
});
+ window.location.href = baseUrl + "/report/download/out" + param;
+ layer.closeAll();
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[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)
+ // }
+ // }
+ // });
});
break;
}
@@ -126,6 +132,19 @@
pageCurr = 1;
tableReload(false);
});
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
});
// 鍏抽棴鍔ㄤ綔
@@ -145,7 +164,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