From c865d7849368bec0808eb186dfa79948f1c2cf95 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:36 +0800
Subject: [PATCH] 修改查询参数
---
src/views/flowmgr/processQuery.vue | 4 +-
src/views/flowmgr/programexport.vue | 19 +++++++--
src/views/flowmgr/processQuery1.vue | 32 ++++++---------
src/views/flowmgr/processQuery2.vue | 28 +++++--------
4 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index 895ad90..0490309 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -11,10 +11,10 @@
type="card"
class="demo-tabs"
>
- <el-tab-pane label="寰呭姙" name="todo">
+ <el-tab-pane label="杩涜涓�" name="todo">
<processQuery1 v-if="activeName==='todo'"></processQuery1>
</el-tab-pane>
- <el-tab-pane label="宸插姙" name="done">
+ <el-tab-pane label="宸茬粨鏉�" name="done">
<processQuery2 v-if="activeName==='done'"> </processQuery2>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index f3c6060..202d3d1 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -96,15 +96,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 +310,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 +331,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 +634,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 +648,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
}
this.onLoad(this.page, data);
done();
@@ -678,7 +672,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 => {
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 84c1a16..aa28046 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -98,12 +98,12 @@
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',
@@ -313,11 +313,11 @@
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: '鍒涘缓鏃堕棿',
@@ -333,13 +333,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',
@@ -642,7 +636,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);
@@ -656,7 +650,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
}
this.onLoad(this.page, data);
done();
@@ -680,7 +674,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
};
this.loading = true;
getList2(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 1635977..3458c9a 100644
--- a/src/views/flowmgr/programexport.vue
+++ b/src/views/flowmgr/programexport.vue
@@ -95,14 +95,20 @@
label: '宸ュ簭鍙�',
prop: 'processNo',
},
+
{
- label: '鍥惧彿鐗堟',
- prop: 'drawingNoEdition',
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
},
{
label: '宸ュ簭鍚嶇О',
prop: 'processName',
},
+ {
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ },
+
{
label: '绋嬪簭鍚嶇О',
prop: 'name',
@@ -158,14 +164,19 @@
prop: 'processNo',
},
{
- label: '鍥惧彿鐗堟',
- prop: 'drawingNoEdition',
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
},
{
label: '宸ュ簭鍚嶇О',
prop: 'processName',
},
{
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ },
+
+ {
label: '绋嬪簭鍚嶇О',
prop: 'name',
search: true,
--
Gitblit v1.9.3