From e26a8c78b542980df3d4fae3a4d097cd29258b04 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 07 九月 2020 13:36:04 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/report/workIn.js | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js index bc173d9..367d367 100644 --- a/src/main/webapp/static/js/report/workIn.js +++ b/src/main/webapp/static/js/report/workIn.js @@ -22,13 +22,14 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/report/viewWorkInList.action', page: true, - limit: 10, + limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [getCol()], request: { - pageName: 'curr', - pageSize: 'limit' + pageName: 'pageNumber', + limitName: 'pageSize' }, parseData: function (res) { return { @@ -87,8 +88,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/viewWorkInExport.action", @@ -118,6 +124,17 @@ 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