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/send.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index 2cd93e8..ea3fd48 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -18,13 +18,13 @@
<el-button type="text"
size="small"
icon="el-icon-info"
- v-if="permission.work_send_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_send_follow"
+ v-if="permissionList.follow"
@click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
</el-button>
</template>
@@ -65,6 +65,7 @@
option: {
height: 'auto',
calcHeight: 20,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -86,6 +87,7 @@
headerAlign:'center',
align:'left',
sortable:true,
+ overHidden:true,
formatter: (val) => {
return val.variables.processName
}
@@ -93,21 +95,25 @@
label: '娴佺▼杩涘害',
prop: 'processIsFinished',
slot: true,
- width: 80,
+ width: 100,
}, {
label: '褰撳墠姝ラ',
prop: 'taskName',
+ width:150
}, {
label: '鍙戣捣鏃堕棿',
sortable:true,
- prop: 'createTime',
+ width:180,
+ prop: 'processDefinitionStartTime'
},{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
- prop: 'categoryName'
+ prop: 'categoryName',
+ width:200
}, {
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
@@ -117,7 +123,13 @@
};
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
+ ...mapGetters(["permission", "flowRoutes","permission"]),
+ permissionList(){
+ return{
+ detailBtn:this.vaildData(this.permission.work_send.work_send_detail,false),
+ follow:this.vaildData(this.permission.work_send.work_send_follow,false),
+ }
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
--
Gitblit v1.9.3