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/send.vue | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index c1931ee..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,
@@ -78,56 +79,57 @@
dialogWidth: 900,
menuWidth: 150,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '娴佺▼杩涘害',
- prop: 'processIsFinished',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '娴佺▼杩涘害',
+ prop: 'processIsFinished',
+ slot: true,
+ width: 100,
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ width:150
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ width:180,
+ prop: 'processDefinitionStartTime'
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName',
+ width:200
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
},
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