From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js
index 703d501..e8ebf77 100644
--- a/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js
@@ -25,8 +25,9 @@
// ,{field: 'id', align: 'center',title: '缂栧彿'}
{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�',event: 'wrkNo', sort: true}
,{field: 'ioTime$', align: 'center',title: '浠诲姟鏃堕棿', width:160, sort: true}
+ ,{field: 'durationTime', align: 'center',title: '鎸佺画鏃堕暱', width:160}
,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��', width:160}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷', width:160}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
--
Gitblit v1.9.1