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/agvWrkDetlLog/wrkDetlLog.js |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
index 85da753..fe21507 100644
--- a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
@@ -2,8 +2,12 @@
 function getCol() {
     var cols = [
         {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
-        ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+        ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
     ];
+    cols.push(
+        //{field: 'suppCode', align: 'center',title: '璐ф灦鐮�'},
+        {field: 'anfme', align: 'center',title: '鏁伴噺'});
+    arrRemove(detlCols,  'field', 'zpallet');
     cols.push.apply(cols, detlCols);
     cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
@@ -39,7 +43,8 @@
                 'code': res.code,
                 'msg': res.msg,
                 'count': res.data.total,
-                'data': res.data.records
+                'data': res.data.records,
+                'countData': res.data.count
             }
         },
         response: {
@@ -59,6 +64,7 @@
                     res.data[_index][data.value] = 'N';
                 }
             });
+
         }
     });
 
@@ -131,6 +137,7 @@
                 break;
             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) {

--
Gitblit v1.9.1