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/agvWrkMastLog/wrkMastLog.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index 8ddc754..d8c2a71 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -21,14 +21,15 @@
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: 'modiTime$', 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) {
@@ -198,7 +200,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkLog.html',
+ content: 'wrkDetlLog.html',
success: function(layero, index){
}
});
--
Gitblit v1.9.1