From 518f6efefe510f45176076261f49e0fa1bc40a07 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 25 八月 2023 11:06:42 +0800
Subject: [PATCH] 处理basemodel，bean里面遇到字段相同且map里面数据为空，则使用bean里面的值
---
Source/UBCS-WEB/src/views/work/done.vue | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 09160ea..9d3d6e2 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -74,44 +74,50 @@
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: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign: 'center',
+ align: 'left',
+ sortable: true,
+ overHidden:true,
+ width:300,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable: true,
+ width:150,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable: true,
+ width:180,
+ prop: 'processDefinitionStartTime'
+ }, {
+ label: '瀹屾垚鏃堕棿',
+ sortable: true,
+ width:180,
+ prop: 'createTime'
+ }, {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable: true,
+ width:200,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鍚姩鏃舵弿杩�',
+ prop: 'processDesc',
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
--
Gitblit v1.9.3