From 2a120264875c70aefcb96327918898fda218c2f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 13:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/processQuery1.vue | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index f3c6060..3563c50 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -85,6 +85,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
// tree: true,
border: true,
@@ -96,15 +97,15 @@
dialogClickModal: false,
column: [
{
- label: '娴佺▼绫诲瀷',
- prop: 'processDefinitionKey',
+ label: '娴佺▼鍚嶇О',
+ prop: 'myProcessName',
search: true,
searchType: 'select',
hide: true,
- dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
+ dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
props: {
label: 'dictValue',
- value: 'remark',
+ value: 'dictValue',
},
},
{
@@ -310,12 +311,12 @@
labelWidth: 100,
span: 8,
column: [
- {
- label: '娴佺▼绫诲瀷',
- prop: 'processDefinitionKey',
+ {
+ label: '娴佺▼鍚嶇О',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
- },
+ return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
+ }
},
{
label: '鍒涘缓鏃堕棿',
@@ -331,13 +332,7 @@
return h('p',{'class': 'margin0'}, row?.variables?.title)
}
},
- {
- label: '娴佺▼鍚嶇О',
- prop: '',
- render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
- }
- },
+
{
label: '宸ヨ壓鐗堟',
prop: 'variables.craftEdition',
@@ -640,7 +635,7 @@
createTimeBegin: params.createTimeBegin || undefined,
createTimeEnd: params.createTimeEnd || undefined,
keyword: params.keyword || undefined,
- processDefinitionKey: params.processDefinitionKey || undefined
+ myProcessName: params.myProcessName || undefined
}
this.query = data
this.onLoad(this.page, data);
@@ -654,7 +649,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
}
this.onLoad(this.page, data);
done();
@@ -678,7 +673,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
};
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
--
Gitblit v1.9.3