From 31f4219f3d7fc041ba6ec2d11084e7e0f61ffdb8 Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: 星期五, 22 三月 2024 11:32:58 +0800
Subject: [PATCH] fix修复已办参数传错
---
src/views/workflow/processInstance/index.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 9830366..19e57f7 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -56,12 +56,11 @@
</el-row>
</template>
- <el-table v-loading="loading" :data="processInstanceList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column fixed align="center" type="index" label="搴忓彿" width="50"></el-table-column>
- <el-table-column v-if="false" fixed align="center" prop="id" label="id"></el-table-column>
- <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
- <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
+ <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
+ <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
<el-table-column align="center" prop="processDefinitionVersion" label="鐗堟湰鍙�" width="90">
<template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
</el-table-column>
@@ -127,7 +126,7 @@
</el-row>
<el-dialog v-if="processDefinitionDialog.visible" v-model="processDefinitionDialog.visible" :title="processDefinitionDialog.title" width="70%">
<el-table v-loading="loading" :data="processDefinitionHistoryList">
- <el-table-column fixed align="center" type="index" label="搴忓彿" width="50"></el-table-column>
+ <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column fixed align="center" prop="name" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
<el-table-column align="center" prop="key" label="鏍囪瘑Key"></el-table-column>
<el-table-column align="center" prop="version" label="鐗堟湰鍙�" width="90">
@@ -154,13 +153,13 @@
<script lang="ts" setup>
import {
- getProcessInstanceRunningByPage,
- getProcessInstanceFinishByPage,
- deleteRuntimeProcessAndHisInst,
- deleteFinishProcessAndHisInst,
- deleteRuntimeProcessInst
+ getPageByRunning,
+ getPageByFinish,
+ deleteRunAndHisInstance,
+ deleteFinishAndHisInstance,
+ deleteRunInstance
} from '@/api/workflow/processInstance';
-import { getProcessDefinitionListByKey, migrationProcessDefinition } from '@/api/workflow/processDefinition';
+import { getListByKey, migrationDefinition } from '@/api/workflow/processDefinition';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
@@ -282,7 +281,7 @@
//鍒嗛〉
const getProcessInstanceRunningList = () => {
loading.value = true;
- getProcessInstanceRunningByPage(queryParams.value).then((resp) => {
+ getPageByRunning(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -291,7 +290,7 @@
//鍒嗛〉
const getProcessInstanceFinishList = () => {
loading.value = true;
- getProcessInstanceFinishByPage(queryParams.value).then((resp) => {
+ getPageByFinish(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -304,10 +303,10 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎id涓恒��' + id + '銆戠殑鏁版嵁椤癸紵');
loading.value = true;
if ('running' === tab.value) {
- await deleteRuntimeProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteRunAndHisInstance(id).finally(() => (loading.value = false));
getProcessInstanceRunningList();
} else {
- await deleteFinishProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteFinishAndHisInstance(id).finally(() => (loading.value = false));
getProcessInstanceFinishList();
}
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
@@ -329,7 +328,7 @@
processInstanceId: row.id,
deleteReason: deleteReason.value
};
- await deleteRuntimeProcessInst(param).finally(() => (loading.value = false));
+ await deleteRunInstance(param).finally(() => (loading.value = false));
getProcessInstanceRunningList();
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
}
@@ -342,7 +341,7 @@
processDefinitionDialog.visible = true;
processDefinitionId.value = id;
loading.value = true;
- getProcessDefinitionListByKey(key).then((resp) => {
+ getListByKey(key).then((resp) => {
if (resp.data && resp.data.length > 0) {
processDefinitionHistoryList.value = resp.data.filter((item: any) => item.id !== id);
}
@@ -353,7 +352,7 @@
const handleChange = async (id: string) => {
await proxy?.$modal.confirm('鏄惁纭鍒囨崲锛�');
loading.value = true;
- migrationProcessDefinition(processDefinitionId.value, id).then((resp) => {
+ migrationDefinition(processDefinitionId.value, id).then((resp) => {
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
getProcessInstanceRunningList();
processDefinitionDialog.visible = false;
--
Gitblit v1.9.3