From 42085aad206257ddeffe71d6defc547b5e13b4b7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 26 六月 2023 19:57:50 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..665405d 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -94,9 +94,9 @@
indexLabelClassName: '搴忓彿',
column: [
{ label: '浠诲姟鍚嶇О', prop: 'historyActivityName', minWidth: 120 },
- { label: '鎵ц鎿嶄綔', prop: 'sex', minWidth: 80 },
+ { label: '鎵ц鎿嶄綔', prop: 'pass', minWidth: 80 ,formatter:this.formatterPass},
{ 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 },
@@ -131,6 +131,10 @@
})
this.apiGetBtnTask(this.processInstanceId)
},
+ formatterPass(row, value, column) {
+ console.log('value',value)
+ return value?'鍚屾剰':'椹冲洖'
+ },
async apiGetBtnTask(id) {
const response = await getBtnTask({ processInstanceId: id })
const res = response.data
@@ -145,7 +149,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 || '鎻愪氦澶辫触');
}
@@ -185,7 +189,7 @@
display: -ms-flexbox;
display: flex;
justify-content: space-between;
- height: 70vh;
+ height: 85vh;
&_tab {
width: 79%;
--
Gitblit v1.9.3