From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1

---
 src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js b/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
index 686640d..84f8fc5 100644
--- a/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
+++ b/src/main/webapp/static/js/agvHandWrkMast/agvHandWrkMast.js
@@ -37,7 +37,7 @@
             ,{field: 'modiUser$', align: 'center',title: '鎿嶄綔浜哄憳'}
             ,{field: 'modiTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+            //,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
         ]],
         request: {
             pageName: 'curr',
@@ -93,6 +93,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) {
@@ -109,6 +110,7 @@
                         'wrkMast': exportData,
                         'fields': fields
                     };
+
                     $.ajax({
                         url: baseUrl+"/wrkMast/export/auth",
                         headers: {'token': localStorage.getItem('token')},
@@ -148,7 +150,7 @@
                     maxmin: true,
                     area: [top.detailWidth, top.detailHeight],
                     shadeClose: true,
-                    content: 'wrkDetlLog.html',
+                    content: 'wrkLog.html',
                     success: function(layero, index){
                     }
                 });
@@ -364,7 +366,7 @@
                 ,{field: 'werks', align: 'center',title: '宸ュ巶'}
                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                 ,{field: 'altme', align: 'center',title: '鍗曚綅'}
-                ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+                ,{field: 'zpallet', align: 'center',title: '璐ф灦鏉$爜'}
                 ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
                 ,{field: 'memo', align: 'center',title: '澶囨敞'}
 

--
Gitblit v1.9.1