From 604ac4fe83bf0641a58fb7dd1a7e2d3481d1be83 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期五, 25 七月 2025 19:24:59 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/processQuery.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index b6060b8..77f9724 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-06-18 09:17:09
* @LastEditors: gaoshp
- * @LastEditTime: 2025-07-22 22:39:59
+ * @LastEditTime: 2025-07-23 22:20:42
* @FilePath: /mdmweb/src/views/flowmgr/processQuery.vue
-->
<template>
@@ -18,11 +18,12 @@
</el-button>
</template>
<template #menu="scope">
- <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
- </el-button>
- <el-button type="danger" text size="default" v-if="scope.row.processDefinitionKey = 'dispatch'"
+ <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
@click.stop="handleAction(scope.row, scope.index, 1)">瀹℃壒琛ㄦ墦鍗�
</el-button>
+ <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
+ </el-button>
+
</template>
</avue-crud>
<el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
@@ -79,7 +80,7 @@
search: true,
searchType: 'select',
hide: true,
- dicUrl: `/blade-system/dict/dictionary?code=flow`,
+ dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
props: {
label: 'dictValue',
value: 'remark',
@@ -129,10 +130,6 @@
style: {},
}, row?.variables?.processName)
}
- },
- {
- label: '鍔犲伐杞﹂棿',
- prop: '',
},
{
label: '鍒涘缓鏃堕棿',
@@ -207,8 +204,8 @@
console.log('toPerson', form);
reassgin({
...form,
- taskId: this.transferTaskSelection[0].taskId,
- processInstanceId: this.transferTaskSelection[0].processInstanceId,
+ taskId: this.selectedList[0].taskId,
+ processInstanceId: this.selectedList[0].processInstanceId,
}).then(res => {
this.$message.success('鎸囨淳鎴愬姛');
this.reassignBox = false;
@@ -231,7 +228,9 @@
type: 'warning',
})
.then(() => {
- deleteRow({ processInstanceId: row.processInstanceId })
+ deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
+ this.onLoad(this.page, this.query);
+ })
})
} else if (flag === 1) {
printRow({ processInstanceId: row.processInstanceId })
@@ -315,10 +314,10 @@
// keyword: params.keyword || ''
// }
data = {
- createTimeBegin: params.createTimeBegin,
- createTimeEnd: params.createTimeEnd,
- keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ createTimeBegin: params.createTimeBegin || undefined,
+ createTimeEnd: params.createTimeEnd || undefined,
+ keyword: params.keyword || undefined,
+ processDefinitionKey: params.processDefinitionKey || undefined
}
this.query = data
this.onLoad(this.page, data);
@@ -360,9 +359,14 @@
};
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
- const data = res.data.data;
+ const data = res.data.data
this.page.total = data.total;
- this.data = data.records;
+ this.data = data.records.map(v=> {
+ return {
+ ...v,
+ id: v.processInstanceId,
+ }
+ });
this.loading = false;
}, () => {
this.data = [];
--
Gitblit v1.9.3