From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/done.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 88cc1f7..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,
@@ -82,6 +83,8 @@
headerAlign: 'center',
align: 'left',
sortable: true,
+ overHidden:true,
+ width:300,
formatter: (val) => {
return val.variables.processName
}
@@ -89,24 +92,29 @@
label: '鍙戣捣浜�',
prop: 'createUser',
sortable: true,
+ width:150,
formatter: (val) => {
return val.variables.createUser
}
}, {
label: '鍙戣捣鏃堕棿',
sortable: true,
- prop: 'createTime',
+ width:180,
+ prop: 'processDefinitionStartTime'
}, {
label: '瀹屾垚鏃堕棿',
sortable: true,
- prop: 'endTime',
+ width:180,
+ prop: 'createTime'
}, {
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable: true,
+ width:200,
prop: 'categoryName'
}, {
label: '娴佺▼鍚姩鏃舵弿杩�',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
@@ -116,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