From 364dfb969de09b97c4629e1c46b9ed9c2352da1c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 07 十月 2024 10:45:25 +0800
Subject: [PATCH] update 优化代码
---
src/views/workflow/task/myDocument.vue | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 1e1d2a0..1bf5bbf 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -42,12 +42,16 @@
</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 v-if="false" align="center" prop="id" label="id"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <template #default="scope">
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ </template>
+ </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>
@@ -57,35 +61,35 @@
<el-tag v-else type="danger">鎸傝捣</el-tag>
</template>
</el-table-column>
- <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+ <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template>
</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" class-name="small-padding fixed-width">
<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.id)">瀹℃壒璁板綍</el-button>
- </el-col>
- <el-col
- v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
- :span="1.5"
- >
- <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
- </el-col>
- <el-col v-if="scope.row.businessStatus === 'waiting'" :span="1.5">
- <el-button link type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">鎾ら攢</el-button>
- </el-col>
- <el-col
- v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
- :span="1.5"
- >
- <el-button link type="primary" size="small" icon="Edit" @click="submitVerifyOpen(scope.row.taskVoList[0].id)">鎻愪氦</el-button>
- </el-col>
- </el-row>
+ <el-tooltip
+ v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
+ content="淇敼"
+ placement="top"
+ >
+ <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
+ </el-tooltip>
+ <el-tooltip
+ v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
+ content="鍒犻櫎"
+ placement="top"
+ >
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip placement="top" content="鏌ョ湅">
+ <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
+ </el-tooltip>
+ <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="鎾ら攢" placement="top">
+ <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -99,32 +103,27 @@
</el-card>
</el-col>
</el-row>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
<!-- 鎻愪氦缁勪欢 -->
<submitVerify ref="submitVerifyRef" @submit-callback="getList" />
</div>
</template>
<script lang="ts" setup>
-import { getCurrentSubmitByPage, deleteRuntimeProcessAndHisInst, cancelProcessApply } from '@/api/workflow/processInstance';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import SubmitVerify from '@/components/Process/submitVerify.vue';
+import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@/api/workflow/processInstance';
import { listCategory } from '@/api/workflow/category';
import { CategoryVO } from '@/api/workflow/category/types';
import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
-//鎻愪氦缁勪欢
-const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-//瀹℃壒璁板綍缁勪欢
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const queryFormRef = ref<ElFormInstance>();
const categoryTreeRef = ref<ElTreeInstance>();
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
-const ids = ref<Array<any>>([]);
+const businessKeys = ref<Array<any>>([]);
// 闈炲崟涓鐢�
const single = ref(true);
// 闈炲涓鐢�
@@ -191,12 +190,6 @@
categoryOptions.value.push(data);
};
-//瀹℃壒璁板綍
-const handleApprovalRecord = (processInstanceId: string) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getList();
@@ -211,14 +204,14 @@
};
// 澶氶�夋閫変腑鏁版嵁
const handleSelectionChange = (selection: ProcessInstanceVO[]) => {
- ids.value = selection.map((item: any) => item.id);
+ businessKeys.value = selection.map((item: any) => item.businessKey);
single.value = selection.length !== 1;
multiple.value = !selection.length;
};
//鍒嗛〉
const getList = () => {
loading.value = true;
- getCurrentSubmitByPage(queryParams.value).then((resp) => {
+ getPageByCurrent(queryParams.value).then((resp) => {
processInstanceList.value = resp.rows;
total.value = resp.total;
loading.value = false;
@@ -227,30 +220,36 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row: ProcessInstanceVO) => {
- const id = row.id || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎id涓恒��' + id + '銆戠殑鏁版嵁椤癸紵');
+ const businessKey = row.businessKey || businessKeys.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎涓氬姟id涓恒��' + businessKey + '銆戠殑鏁版嵁椤癸紵');
loading.value = true;
if ('running' === tab.value) {
- await deleteRuntimeProcessAndHisInst(id).finally(() => (loading.value = false));
+ await deleteRunAndHisInstance(businessKey).finally(() => (loading.value = false));
getList();
}
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
};
/** 鎾ら攢鎸夐挳鎿嶄綔 */
-const handleCancelProcessApply = async (processInstanceId: string) => {
+const handleCancelProcessApply = async (businessKey: string) => {
await proxy?.$modal.confirm('鏄惁纭鎾ら攢褰撳墠鍗曟嵁锛�');
loading.value = true;
if ('running' === tab.value) {
- await cancelProcessApply(processInstanceId).finally(() => (loading.value = false));
+ await cancelProcessApply(businessKey).finally(() => (loading.value = false));
getList();
}
proxy?.$modal.msgSuccess('鎾ら攢鎴愬姛');
};
-//鎻愪氦
-const submitVerifyOpen = async (id: string) => {
- if (submitVerifyRef.value) {
- submitVerifyRef.value.openDialog(id);
- }
+
+//鍔炵悊
+const handleOpen = async (row, type) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+ wfNodeConfigVo: row.wfNodeConfigVo,
+ businessKey: row.businessKey,
+ taskId: row.id,
+ type: type
+ });
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
</script>
--
Gitblit v1.9.3