From 8e3411a56294bb5884ff032dda49a862a87339ff Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 23 六月 2025 22:48:12 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 404db80..6587758 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -13,7 +13,7 @@
</el-button>
</template>
</avue-crud>
- <el-dialog title="瀹℃壒" append-to-body v-model="approveBox" width="20%">
+ <el-dialog title="瀹℃壒" append-to-body v-model="approveBox" width="30%">
<avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
<!-- <template #footer>
<span class="dialog-footer">
@@ -55,7 +55,7 @@
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
{
- label: '涓嬩竴瀹℃壒鐢ㄦ埛',
+ label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
@@ -88,11 +88,6 @@
form: {},
query: {},
loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
option: {
addBtn: false,
editBtn: false,
@@ -110,7 +105,6 @@
// viewBtn: true,
menuWidth: 100,
dialogClickModal: false,
-
column: [
{
label: '鍏抽敭瀛�',
@@ -167,6 +161,24 @@
// hide: true,
},
{
+ label: '涓婁竴姝ョ敤鎴�',
+ width: 200,
+ prop: '',
+ formatter: (val, value, label) => {
+ return `${val?.variables?.approveUserNickName || ''}`;
+ },
+ },
+ {
+ label: '褰撳墠鑺傜偣',
+ width: 200,
+ prop: 'taskName',
+ },
+ {
+ label: '鏂囦欢',
+ width: 200,
+ prop: '',
+ },
+ {
label: '鍒拌揪鏃堕棿',
width: 200,
prop: 'createTime',
@@ -175,15 +187,6 @@
label: '鍒拌揪鎻忚堪',
width: 200,
prop: 'comment',
- },
- {
- label: '鏂囦欢',
- width: 200,
- prop: '',
- },
- {
- label: '褰撳墠鑺傜偣',
- prop: 'taskName',
},
],
@@ -285,6 +288,7 @@
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || ''
}
+ this.query = data
this.onLoad(this.page, data);
done();
},
--
Gitblit v1.9.3