From 4f20f3a30f6f453c0b3ad3425ba82689da2defd4 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期六, 16 八月 2025 19:35:55 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/processQuery.vue | 11 +++++++++--
src/views/basesetting/produceplan.vue | 29 +++++++++++++++--------------
src/views/flow/todolist.vue | 1 +
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/views/basesetting/produceplan.vue b/src/views/basesetting/produceplan.vue
index f610200..870cd83 100644
--- a/src/views/basesetting/produceplan.vue
+++ b/src/views/basesetting/produceplan.vue
@@ -128,20 +128,7 @@
hide: true,
display: false,
},
- {
- label: '涓撲笟缁勯暱',
- prop: 'teamLeaderId',
- type: 'select',
- span: 24,
- display: true,
- filterable:true,
- dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- props: {
- label: 'name',
- value: 'id',
- },
- rules: [{ required: true, message: '璇疯緭鍏ヤ笓涓氱粍闀�', trigger: 'blur' }],
- },
+
{
label: '缂栧埗锛堝伐鑹哄憳)',
label: '缂栧埗',
@@ -173,6 +160,20 @@
rules: [{ required: true, message: '璇疯緭鍏ユ牎瀵癸紙宸ヨ壓鍛�)', trigger: 'blur' }],
},
{
+ label: '涓撲笟缁勯暱',
+ prop: 'teamLeaderId',
+ type: 'select',
+ span: 24,
+ display: true,
+ filterable:true,
+ dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
+ props: {
+ label: 'name',
+ value: 'id',
+ },
+ rules: [{ required: true, message: '璇疯緭鍏ヤ笓涓氱粍闀�', trigger: 'blur' }],
+ },
+ {
label: '瀹℃牳(楂樺笀)',
label: '瀹℃牳',
prop: 'seniorId',
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 9aded8a..d1f7ad8 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -294,6 +294,7 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ filterable:true,
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
// dicFlag: true,
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index 2acf1c7..f3c6060 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -333,9 +333,9 @@
},
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.processDefinitionName)
+ return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
}
},
{
@@ -443,6 +443,13 @@
return h('p',{'class': 'margin0'}, row?.variables?.programPackageName || '');
}
},
+ {
+ label: '鍋忕鍗曞彿',
+ prop: '',
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
+ }
+ },
],
},
selectedList: [],
--
Gitblit v1.9.3