From 0c7e5b933e6f700a0849283fc028fc9f497c76b6 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 26 六月 2023 11:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 86617b7..056cfed 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -96,7 +96,7 @@
{ label: '浠诲姟鍚嶇О', prop: 'historyActivityName', minWidth: 120 },
{ label: '鎵ц鎿嶄綔', prop: 'sex', minWidth: 80 },
{ label: '浠诲姟寮�濮嬫椂闂�', prop: 'createTime', minWidth: 140 },
- { label: '瀹℃壒鎰忚', prop: 'sex', minWidth: 220, overHidden: true },
+ { label: '瀹℃壒鎰忚', prop: 'comment', minWidth: 220, overHidden: true },
{ label: '鎵ц浜�', prop: 'assigneeName', minWidth: 80 },
{ label: '浠诲姟瀹屾垚鏃堕棿', prop: 'endTime', minWidth: 140 },
{ label: '宸蹭笂浼犲鎵规枃浠�', prop: 'sex', minWidth: 220, overHidden: true },
@@ -145,7 +145,7 @@
if (res.success) {
this.$message.success(res.msg);
this.$router.$avueRouter.closeTag();
- this.$router.push({ path: `/work/start` });
+ this.$router.push({ path: `/work/todo` });
} else {
this.$message.error(res.msg || '鎻愪氦澶辫触');
}
--
Gitblit v1.9.3