From fa815905b50f55c654e120d717647f59f96d7025 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 26 六月 2023 14:47:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 8 ++++++--
1 files changed, 6 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 056cfed..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,7 +94,7 @@
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: 'comment', minWidth: 220, overHidden: true },
{ label: '鎵ц浜�', prop: 'assigneeName', minWidth: 80 },
@@ -130,6 +130,10 @@
}
})
this.apiGetBtnTask(this.processInstanceId)
+ },
+ formatterPass(row, value, column) {
+ console.log('value',value)
+ return value?'鍚屾剰':'椹冲洖'
},
async apiGetBtnTask(id) {
const response = await getBtnTask({ processInstanceId: id })
@@ -185,7 +189,7 @@
display: -ms-flexbox;
display: flex;
justify-content: space-between;
- height: 70vh;
+ height: 85vh;
&_tab {
width: 79%;
--
Gitblit v1.9.3