From 06e1ebee3ec23ceed20477eba43b2925ef6bb0c3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:33:46 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 93 ++++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index d593008..e5ccdde 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -29,7 +29,7 @@
<el-button type="primary" @click="getTableData">鏌ヨ</el-button>
<el-button type="primary" @click="resetParam">閲嶇疆</el-button>
<el-button type="primary" @click="exportTable">瀵煎嚭褰撳墠椤甸潰鏁版嵁</el-button>
- <el-button type="primary" @click="exportTableAll">瀵煎嚭鎵�鏈�</el-button>
+ <el-button type="primary" @click="exportTableAll">瀵煎嚭鎵�鏈�(鐐瑰嚮鍚庣瓑寰�2鍒嗛挓浠ヤ笂锛屼笉瑕侀噸澶嶇偣鍑�)</el-button>
</el-form-item>
</el-form>
<el-table ref="singleTable" :data="tableData" style="width: 100%;">
@@ -164,22 +164,52 @@
// 2. 瀹屾暣瀛楁鏄犲皠
const headerMap = {
taskNo: '浠诲姟鍙�',
- status$: '浠诲姟鐘舵��',
+ status: 'status',
wrkNo: '宸ヤ綔鍙�',
- createTime$: '鐢熸垚鏃堕棿',
- modiTime$: '鏇存柊鏃堕棿',
- assignTime$: '娲惧彂鏃堕棿',
- executeTime$: '鎵ц鏃堕棿',
- completeTime$: '瀹岀粨鏃堕棿',
- cancelTime$: '鍙栨秷鏃堕棿',
- durationTime: '鎸佺画鏃堕暱',
- ioType$: '浠诲姟绫诲瀷',
+ createTime: 'createTime',
+ ioType: 'ioType',
+ ioPri: '浼樺厛绾�',
startPoint: '璧风偣浣嶇疆',
targetPoint: '缁堢偣浣嶇疆',
- wrkSts$: '宸ヤ綔鐘舵��',
- crnNo: '鍫嗗灈鏈哄彿',
+ modiUser: 'modiUser',
+ modiTime: 'modiTime',
+ memo: '澶囨敞',
barcode: '鏉＄爜',
- memo: '澶囨敞'
+ assignTime: 'assignTime',
+ executeTime: 'executeTime',
+ completeTime: 'completeTime',
+ cancelTime: 'cancelTime',
+ wrkSts: 'wrkSts',
+ crnNo: '鍫嗗灈鏈哄彿',
+ commandStep: 'step',
+ transferMark: 'mark',
+ wrkSts$: '宸ヤ綔鐘舵��',
+ ioType$: '浠诲姟绫诲瀷',
+ status$: '浠诲姟鐘舵��',
+ createTime$: '鐢熸垚鏃堕棿',
+ modiTime$: '鏇存柊鏃堕棿',
+ modiUser$: '鏇存柊浜哄憳',
+ completeTime$: '瀹岀粨鏃堕棿',
+ executeTime$: '鎵ц鏃堕棿',
+ assignTime$: '娲惧彂鏃堕棿',
+ cancelTime$: '鍙栨秷鏃堕棿'
+ // taskNo: '浠诲姟鍙�',
+ // status$: '浠诲姟鐘舵��',
+ // wrkNo: '宸ヤ綔鍙�',
+ // createTime$: '鐢熸垚鏃堕棿',
+ // modiTime$: '鏇存柊鏃堕棿',
+ // assignTime$: '娲惧彂鏃堕棿',
+ // executeTime$: '鎵ц鏃堕棿',
+ // completeTime$: '瀹岀粨鏃堕棿',
+ // cancelTime$: '鍙栨秷鏃堕棿',
+ // durationTime: '鎸佺画鏃堕暱',
+ // ioType$: '浠诲姟绫诲瀷',
+ // startPoint: '璧风偣浣嶇疆',
+ // targetPoint: '缁堢偣浣嶇疆',
+ // wrkSts$: '宸ヤ綔鐘舵��',
+ // crnNo: '鍫嗗灈鏈哄彿',
+ // barcode: '鏉＄爜',
+ // memo: '澶囨敞'
}
// 3. 鍒涘缓宸ヤ綔琛�
@@ -220,22 +250,35 @@
// 2. 瀹屾暣瀛楁鏄犲皠
const headerMap = {
taskNo: '浠诲姟鍙�',
- status$: '浠诲姟鐘舵��',
+ status: '浠诲姟鐘舵��',
wrkNo: '宸ヤ綔鍙�',
- createTime$: '鐢熸垚鏃堕棿',
- modiTime$: '鏇存柊鏃堕棿',
- assignTime$: '娲惧彂鏃堕棿',
- executeTime$: '鎵ц鏃堕棿',
- completeTime$: '瀹岀粨鏃堕棿',
- cancelTime$: '鍙栨秷鏃堕棿',
- durationTime: '鎸佺画鏃堕暱',
- ioType$: '浠诲姟绫诲瀷',
+ createTime: 'createTime',
+ ioType: 'ioType',
+ ioPri: '浼樺厛绾�',
startPoint: '璧风偣浣嶇疆',
targetPoint: '缁堢偣浣嶇疆',
- wrkSts$: '宸ヤ綔鐘舵��',
- crnNo: '鍫嗗灈鏈哄彿',
+ modiUser: 'modiUser',
+ modiTime: 'modiTime',
+ memo: '澶囨敞',
barcode: '鏉＄爜',
- memo: '澶囨敞'
+ assignTime: 'assignTime',
+ executeTime: 'executeTime',
+ completeTime: 'completeTime',
+ cancelTime: 'cancelTime',
+ wrkSts: 'wrkSts',
+ crnNo: '鍫嗗灈鏈哄彿',
+ commandStep: 'step',
+ transferMark: 'mark',
+ wrkSts$: '宸ヤ綔鐘舵��',
+ ioType$: '浠诲姟绫诲瀷',
+ status$: '浠诲姟鐘舵��',
+ createTime$: '鐢熸垚鏃堕棿',
+ modiTime$: '鏇存柊鏃堕棿',
+ modiUser$: '鏇存柊浜哄憳',
+ completeTime$: '瀹岀粨鏃堕棿',
+ executeTime$: '鎵ц鏃堕棿',
+ assignTime$: '娲惧彂鏃堕棿',
+ cancelTime$: '鍙栨秷鏃堕棿'
}
// 3. 鍒涘缓宸ヤ綔琛�
--
Gitblit v1.9.1