From 43a90d017c9c54ca8683b30b61ae79934fe05a85 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 15 十二月 2023 10:31:19 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/report/workOut.js | 56 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js index 18a6352..c8b06bf 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; @@ -13,29 +24,14 @@ headers: {token: localStorage.getItem('token')}, 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 { @@ -94,8 +90,13 @@ fields.push(col.field); } }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); var param = { - 'fields': fields + fields: fields, + exportData: exportData }; $.ajax({ url: baseUrl+"/report/viewWorkOutExport.action", @@ -125,6 +126,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 + }); + }); // 鍏抽棴鍔ㄤ綔 -- Gitblit v1.9.1