From 3a6454cfc170158a7034654cd7d84aed0e6a7947 Mon Sep 17 00:00:00 2001 From: zhanglc Date: Tue, 9 Dec 2025 21:50:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E3=80=90bpm=E3=80=91bpmn=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8:=20=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bpm/model/index.ts | 1 + src/views/bpm/oa/leave/create.vue | 26 +++++++++++++++++++++++++ src/views/bpm/oa/leave/index.vue | 19 ++++++++++++++++++ src/views/bpm/processInstance/index.vue | 21 ++++++++++++-------- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts index 63b6af6ad..6d2b4d224 100644 --- a/src/api/bpm/model/index.ts +++ b/src/api/bpm/model/index.ts @@ -6,6 +6,7 @@ export type ProcessDefinitionVO = { deploymentTIme: string suspensionState: number formType?: number + formCustomCreatePath?: string } export type ModelVO = { diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue index cf4a13e2a..4c7b336e4 100644 --- a/src/views/bpm/oa/leave/create.vue +++ b/src/views/bpm/oa/leave/create.vue @@ -79,6 +79,7 @@ defineOptions({ name: 'BpmOALeaveCreate' }) const message = useMessage() // 消息弹窗 const { delView } = useTagsViewStore() // 视图操作 const { push, currentRoute } = useRouter() // 路由 +const { query } = useRoute() // 查询参数 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formData = ref({ @@ -190,6 +191,26 @@ const daysDifference = () => { return Math.floor(diffTime / oneDay) } +/** 获取请假数据，用于重新发起时自动填充 */ +const getLeaveData = async (id: number) => { + try { + formLoading.value = true + const data = await LeaveApi.getLeave(id) + if (!data) { + message.error('重新发起请假失败，原因：请假数据不存在') + return + } + formData.value = { + type: data.type, + reason: data.reason, + startTime: data.startTime, + endTime: data.endTime + } + } finally { + formLoading.value = false + } +} + /** 初始化 */ onMounted(async () => { // TODO @小北：这里可以简化，统一通过 getApprovalDetail 处理么？ @@ -205,6 +226,11 @@ onMounted(async () => { processDefinitionId.value = processDefinitionDetail.id startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks + // 如果有业务编号，说明是重新发起，需要加载原有数据 + if (query.id) { + await getLeaveData(Number(query.id)) + } + // 审批相关：加载最新的审批详情，主要用于节点预测 await getApprovalDetail() }) diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue index 1d1d42740..9fab923a0 100644 --- a/src/views/bpm/oa/leave/index.vue +++ b/src/views/bpm/oa/leave/index.vue @@ -140,6 +140,15 @@ > 取消 + + 重新发起 + @@ -206,6 +215,16 @@ const handleCreate = () => { router.push({ name: 'OALeaveCreate' }) } +/** 重新发起操作 */ +const handleReCreate = (row: LeaveApi.LeaveVO) => { + router.push({ + name: 'OALeaveCreate', + query: { + id: row.id + } + }) +} + /** 详情操作 */ const handleDetail = (row: LeaveApi.LeaveVO) => { router.push({ diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index d6fc83d38..9d7d6cc72 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -275,21 +275,26 @@ const resetQuery = () => { /** 发起流程操作 **/ const handleCreate = async (row?: ProcessInstanceVO) => { - // 如果是【业务表单】，不支持重新发起 if (row?.id) { const processDefinitionDetail = await DefinitionApi.getProcessDefinition( row.processDefinitionId ) + //如果是【业务表单】，跳转到对应的发起界面 if (processDefinitionDetail.formType === 20) { - message.error('重新发起流程失败，原因：该流程使用业务表单，不支持重新发起') - return + await router.push({ + path: processDefinitionDetail.formCustomCreatePath, + query: { + id: row.businessKey + } + }) + } else if (processDefinitionDetail.formType === 10) { + //如果是【流程表单】，跳转到流程发起界面 + await router.push({ + name: 'BpmProcessInstanceCreate', + query: { processInstanceId: row.id } + }) } } - // 跳转发起流程界面 - await router.push({ - name: 'BpmProcessInstanceCreate', - query: { processInstanceId: row?.id } - }) } /** 查看详情 */ From 19f38c4a9ea29a36e22a48ae79123201cf91c8e2 Mon Sep 17 00:00:00 2001 From: z95813 <61101985+MurphyZX@users.noreply.github.com> Date: Mon, 15 Dec 2025 14:27:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E4=B8=8D=E9=9C=80=E8=A6=81=E9=99=A4100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pay/order/OrderDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pay/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue index 895bc1601..90d4ccbce 100644 --- a/src/views/pay/order/OrderDetail.vue +++ b/src/views/pay/order/OrderDetail.vue @@ -21,7 +21,7 @@ - {{ (detailData.channelFeeRate / 100.0).toFixed(2) }}% + {{ detailData.channelFeeRate.toFixed(2) }}% {{ formatDate(detailData.successTime) }}