From 1561a163caf814bd57418604f7f56a212f192243 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 26 二月 2025 20:11:36 +0800
Subject: [PATCH] 四期

---
 src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index c29516e..59ccad07 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -21,13 +21,14 @@
         cellMinWidth: 50,
         cols: [[
             {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
+            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
             ,{field: 'modiTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
             ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
             ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+            ,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
             ,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false}
             ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
@@ -142,6 +143,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