From fff32dc747a54cfa796c3ebde3334d54c7a827a3 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:40:21 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/report/workOut.js |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 035d6b5..4c12f33 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -1,12 +1,12 @@
 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: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
     ];
     cols.push.apply(cols, detlCols);
+
+    cols.del({field: 'cstateid$', align: 'center',title: '搴撳瓨鐘舵��'})
     return cols;
 }
 
@@ -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