From aa61aad410dba7922a248d43898105eb8e12de96 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 16 八月 2025 11:04:24 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/report/workIn.js |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 185e5cb..34cb129 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -1,9 +1,10 @@
 var pageCurr;
 function getCol() {
     var cols = [
-        {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
+        {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
         ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
     ];
+    arrRemove(detlCols,  'field', 'cstateid$');
     cols.push.apply(cols, detlCols);
     return cols;
 }
@@ -88,8 +89,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",

--
Gitblit v1.9.1