From c417c6debefef2e722bd1bbbf24ca117433bed06 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 三月 2024 18:43:45 +0800
Subject: [PATCH] update 升级 element vite 版本 最低nodejs版本提升到18.18.0
---
src/views/workflow/processInstance/index.vue | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 9830366..88746c7 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>
@@ -78,27 +77,9 @@
</el-table-column>
<el-table-column align="center" prop="startTime" label="鍚姩鏃堕棿" width="160"></el-table-column>
<el-table-column v-if="tab === 'finish'" align="center" prop="endTime" label="缁撴潫鏃堕棿" width="160"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" :width="tab === 'finish' ? '130' : '160'">
<template #default="scope">
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">瀹℃壒璁板綍</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
- </el-col>
- </el-row>
<el-row v-if="tab === 'running'" :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- link
- type="primary"
- size="small"
- icon="Sort"
- @click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
- >鍒囨崲鐗堟湰</el-button
- >
- </el-col>
<el-col :span="1.5">
<el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300">
<el-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="璇疯緭鍏ヤ綔搴熷師鍥�" />
@@ -110,6 +91,24 @@
<el-button link type="primary" size="small" icon="CircleClose">浣滃簾</el-button>
</template>
</el-popover>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ link
+ type="primary"
+ size="small"
+ icon="Sort"
+ @click="getProcessDefinitionHitoryList(scope.row.processDefinitionId, scope.row.processDefinitionKey)"
+ >鍒囨崲鐗堟湰</el-button
+ >
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</el-col>
</el-row>
</template>
@@ -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">
@@ -147,26 +146,22 @@
</el-table-column>
</el-table>
</el-dialog>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
</div>
</template>
<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 ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import { getListByKey, migrationDefinition } from '@/api/workflow/processDefinition';
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
//瀹℃壒璁板綍缁勪欢
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
@@ -214,11 +209,6 @@
categoryCode: undefined
});
-onMounted(() => {
- getProcessInstanceRunningList();
- getTreeselect();
-});
-
/** 鑺傜偣鍗曞嚮浜嬩欢 */
const handleNodeClick = (data: CategoryVO) => {
queryParams.value.categoryCode = data.categoryCode;
@@ -251,12 +241,6 @@
categoryOptions.value.push(data);
};
-//瀹℃壒璁板綍
-const handleApprovalRecord = (row: any) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(row.id);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
if ('running' === tab.value) {
@@ -282,7 +266,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 +275,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,15 +288,16 @@
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('鍒犻櫎鎴愬姛');
};
const changeTab = async (data: string) => {
+ processInstanceList.value = []
queryParams.value.pageNum = 1;
if ('running' === data) {
getProcessInstanceRunningList();
@@ -329,7 +314,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 +327,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,11 +338,31 @@
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;
loading.value = false;
});
};
+/** 鏌ョ湅鎸夐挳鎿嶄綔 */
+const handleView = (row) => {
+ if(row.wfFormDefinitionVo){
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `${row.wfFormDefinitionVo.path}`,
+ query: {
+ id: row.businessKey,
+ type: 'view'
+ }
+ })
+ }else{
+ proxy?.$modal.msgError('璇峰埌娴佺▼瀹氫箟鑿滃崟閰嶇疆璺敱锛�');
+ }
+};
+
+onMounted(() => {
+ getProcessInstanceRunningList();
+ getTreeselect();
+});
</script>
--
Gitblit v1.9.3