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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 035d6b5..c8b06bf 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -1,7 +1,7 @@
 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: '搴撲綅鍙�'}
         ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
         ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
@@ -90,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",

--
Gitblit v1.9.1