From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/work/done.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 7dd1822..3f4a3ea 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -62,6 +62,7 @@
           height: 'auto',
           calcHeight: 0,
           tip: false,
+          columnBtn:false,
           searchShow: true,
           searchMenuSpan: 6,
           border: true,
@@ -99,12 +100,12 @@
             label: '鍙戣捣鏃堕棿',
             sortable: true,
             width:180,
-            prop: 'createTime',
+            prop: 'processDefinitionStartTime'
           }, {
             label: '瀹屾垚鏃堕棿',
             sortable: true,
             width:180,
-            prop: 'historyTaskEndTime',
+            prop: 'createTime'
           }, {
             label: '鎵�灞炴祦绋嬫ā鏉�',
             sortable: true,

--
Gitblit v1.9.3