From c1cd979992d45347dcbca48e24e6502db7a3831b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 10:19:53 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/report/workIn.js |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 80267c4..367d367 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -28,8 +28,8 @@
         cellMinWidth: 50,
         cols: [getCol()],
         request: {
-            pageName: 'curr',
-            pageSize: 'limit'
+            pageName: 'pageNumber',
+            limitName: 'pageSize'
         },
         parseData: function (res) {
             return {
@@ -88,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",
@@ -119,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