From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/done.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 7dd1822..85236e7 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -18,13 +18,13 @@
<el-button type="text"
size="small"
icon="el-icon-info"
- v-if="permission.work_done_detail"
+ v-if="permissionList.detailBtn"
@click.stop="handleDetail(scope.row)">璇︽儏
</el-button>
<el-button type="text"
size="small"
icon="el-icon-search"
- v-if="permission.work_done_follow"
+ v-if="permissionList.follow"
@click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
</el-button>
</template>
@@ -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,
@@ -123,7 +124,13 @@
};
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
+ ...mapGetters(["permission", "flowRoutes","permission"]),
+ permissionList(){
+ return{
+ detailBtn:this.vaildData(this.permission.work_done.work_done_detail,false),
+ follow:this.vaildData(this.permission.work_done.work_done_follow,false),
+ }
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
--
Gitblit v1.9.3