From 4f32569fae4ae4f346da7ef80e6b76d1b4187821 Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Sun, 7 Apr 2024 08:32:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E5=9B=BE?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=87=BA=E5=BF=85=E5=A1=AB=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=EF=BC=9B=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/helper/generatorHelper.ts | 12 ++- src/views/secondDev/approveFlowPage.vue | 24 +++++- src/views/secondDev/createFlow.vue | 103 +++++++++++++----------- 3 files changed, 86 insertions(+), 53 deletions(-) diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts index 6a8f75c..0b332af 100644 --- a/src/utils/helper/generatorHelper.ts +++ b/src/utils/helper/generatorHelper.ts @@ -1541,10 +1541,14 @@ ${hasTemplatePrint ? ' reactive ' : ''} hasStartWorkButton ? ` function handleStartwork(record: Recordable) { - if (record.workflowData) { - visibleLookProcessRef.value = true; - processIdRef.value = record.workflowData?.processId; - } + const { processId, schemaId } = record.workflowData; + router.push({ + path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', + query: { + readonly: 1, + taskId: '' + } + }); } ${ hasFlowRecordButton diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue index 7fcd45e..688bdea 100644 --- a/src/views/secondDev/approveFlowPage.vue +++ b/src/views/secondDev/approveFlowPage.vue @@ -42,6 +42,12 @@ + + + + @@ -61,6 +67,7 @@ import Title from '/@/components/Title/src/Title.vue'; import FlowHistory from '/@/components/SecondDev/FlowHistory.vue'; import { message } from 'ant-design-vue'; import useEventBus from '/@/hooks/event/useEventBus'; +import ProcessInformation from '/@/views/workflow/task/components/flow/ProcessInformation.vue'; const { data, approveUserData, initProcessData, notificationError, notificationSuccess } = userTaskItem(); const { bus, FLOW_PROCESSED } = useEventBus(); @@ -80,6 +87,7 @@ const formConfigs = ref(); const opinionDlg = ref(); const validateSuccess = ref(false); const formInformation = ref(); +const showFlowChart = ref(false); let approvalData = reactive({ isCountersign: false, @@ -99,7 +107,19 @@ let approvalData = reactive({ }); let approvedType = ref(ApproveType.AGREE); -function onMoreClick() { } +function onMoreClick(e) { + if (e.key === "flowchart") { + openFlowChart() + } +} + +function closeFlowChart() { + showFlowChart.value = false; +} + +function openFlowChart() { + showFlowChart.value = true; +} function close() { tabStore.closeTab(currentRoute, router); @@ -267,7 +287,7 @@ async function getApproveParams() { async function onFinish(values) { try { - if (/*validateSuccess.value*/ true) { + if (validateSuccess.value) { let params = await getApproveParams(); await postApproval(params); flowSuccess(); diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue index 4683995..93a9e36 100644 --- a/src/views/secondDev/createFlow.vue +++ b/src/views/secondDev/createFlow.vue @@ -1,53 +1,55 @@ @@ -78,6 +80,7 @@ const fullPath = currentRoute.fullPath; const rSchemaId = rParams.arg1; const rDraftsId = rParams.arg2; const taskId = ref(); +const loading = ref(false) const draftsJsonStr = localStorage.getItem('draftsJsonStr'); let formInformation = ref(); const opinionDlg = ref(); @@ -193,6 +196,7 @@ function createFlowSuccess(taskList) { message.success('流程发起成功'); data.submitLoading = false; + loading.value = false setTimeout(() => { close(); }, 500); @@ -233,6 +237,7 @@ async function onFinish(values) { await postApproval(params); flowSuccess(); data.submitLoading = false; + loading.value = false } } catch (error) { flowFail(); @@ -260,6 +265,7 @@ async function getApproveParams() { async function saveLaunch() { data.submitLoading = true; + loading.value = true try { let validateForms = await formInformation.value.validateForm(); let system = formInformation.value.getSystemType(); @@ -300,6 +306,7 @@ async function saveLaunch() { if (taskList.length > 0) { notificationError('提交失败', '流程设计错误，开始后的第一个节点必须是审批人为发起人的起草节点。'); data.submitLoading = false; + loading.value = false } else { createFlowSuccess(taskList); } @@ -309,10 +316,12 @@ async function saveLaunch() { } else { data.submitLoading = false; notificationError(t('发起流程'), t('表单校验未通过')); + loading.value = false } } } catch (error) { data.submitLoading = false; + loading.value = false notificationError(t('发起流程'), t('发起流程失败')); } }