From e581891072a36f0d0f7f57246366ded965e2ab8a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期四, 25 一月 2024 10:11:17 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS-WEB/src/views/work/claim.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 63b6582..5257443 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -17,19 +17,19 @@
<el-button type="text"
size="small"
icon="el-icon-download"
- v-if="permission.work_claim_sign"
+ v-if="permissionList.signtBtn"
@click.stop="handleClaim(scope.row)">绛炬敹
</el-button>
<el-button type="text"
size="small"
icon="el-icon-info"
- v-if="permission.work_claim_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_claim_follow"
+ v-if="permissionList.follow"
@click.stop="handleImage(scope.row,scope.index)">娴佺▼鍥�
</el-button>
</template>
@@ -68,6 +68,7 @@
calcHeight: 0,
tip: false,
simplePage: true,
+ columnBtn:false,
searchShow: true,
searchMenuSpan: 6,
border: true,
@@ -88,6 +89,8 @@
headerAlign:'center',
align:'left',
sortable:true,
+ width:300,
+ overHidden:true,
formatter: (val) => {
return val.variables.processName
}
@@ -95,23 +98,27 @@
label: '鍙戣捣浜�',
prop: 'createUser',
sortable:true,
+ width:150,
formatter: (val) => {
return val.variables.createUser
}
}, {
label: '鍙戣捣鏃堕棿',
sortable:true,
- prop: 'createTime',
+ width:180,
+ prop: 'processDefinitionStartTime'
}, {
label: '褰撳墠姝ラ',
prop: 'taskName',
},{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
+ width:200,
prop: 'categoryName'
}, {
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
@@ -121,7 +128,14 @@
};
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
+ ...mapGetters(["permission", "flowRoutes","permission"]),
+ permissionList(){
+ return{
+ signtBtn:this.vaildData(this.permission.work_claim.work_claim_sign,false),
+ detailBtn:this.vaildData(this.permission.work_claim.work_claim_detail,false),
+ follow:this.vaildData(this.permission.work_claim.work_claim_follow,false),
+ }
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
--
Gitblit v1.9.3