From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 2ca190e..e50c237 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,6 +3,9 @@
     var cols = [
         {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
         ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+        ,{field: 'floor', align: 'center',title: '妤煎眰'}
+        ,{field: 'loc_type1$', align: 'center',title: '搴撲綅绫诲瀷'}
+
     ];
     cols.push.apply(cols, detlCols);
     return cols;
@@ -80,6 +83,7 @@
         switch(obj.event) {
             case 'exportData':
                 layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    layer.load(2, {time: 600*1000});
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -92,6 +96,7 @@
                     $.each($('#search-box [name]').serializeArray(), function() {
                         param += this.name + '=' + this.value + '&';
                     });
+                    console.log(param);
                     window.location.href = baseUrl + "/report/download/in" + param;
                     layer.closeAll();
                     // var exportData = {};

--
Gitblit v1.9.1