From f3abcd1442f030de40455334f18a4bbfffbcf05a Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Tue, 17 Dec 2024 18:59:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E4=B8=80=E4=B8=9A=E5=8A=A1id?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflow/instance/index.ts | 4 ++-- src/api/workflow/workflowCommon/index.ts | 2 +- src/api/workflow/workflowCommon/types.ts | 4 ++-- src/components/Process/approvalRecord.vue | 4 ++-- src/views/workflow/leave/leaveEdit.vue | 4 ++-- src/views/workflow/processInstance/index.vue | 2 +- src/views/workflow/task/allTaskWaiting.vue | 2 +- src/views/workflow/task/myDocument.vue | 2 +- src/views/workflow/task/taskCopyList.vue | 2 +- src/views/workflow/task/taskFinish.vue | 2 +- src/views/workflow/task/taskWaiting.vue | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/api/workflow/instance/index.ts b/src/api/workflow/instance/index.ts index b58883c..42d748d 100644 --- a/src/api/workflow/instance/index.ts +++ b/src/api/workflow/instance/index.ts @@ -31,9 +31,9 @@ export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise { +export const flowImage = (businessId: string | number) => { return request({ - url: `/workflow/instance/flowImage/${businessKey}` + '?t' + Math.random(), + url: `/workflow/instance/flowImage/${businessId}` + '?t' + Math.random(), method: 'get' }); }; diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index fd9e7c0..4952cb8 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -7,7 +7,7 @@ export default { proxy.$router.push({ path: routerJumpVo.formPath, query: { - id: routerJumpVo.businessKey, + id: routerJumpVo.businessId, type: routerJumpVo.type, taskId: routerJumpVo.taskId } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 9991b4a..3e7a71d 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -1,5 +1,5 @@ export interface RouterJumpVo { - businessKey: string; + businessId: string; taskId: string | number; type: string; formCustom: string; @@ -7,7 +7,7 @@ export interface RouterJumpVo { } export interface StartProcessBo { - businessKey: string | number; + businessId: string | number; flowCode: string; variables: any; } diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index 355afae..09f91d7 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -76,12 +76,12 @@ const tabActiveName = ref('bpmn'); const imgUrl = ref(''); //初始化查询审批记录 -const init = async (businessKey: string | number) => { +const init = async (businessId: string | number) => { visible.value = true; loading.value = true; tabActiveName.value = 'bpmn'; historyList.value = []; - flowImage(businessKey).then((resp) => { + flowImage(businessId).then((resp) => { if (resp.data) { historyList.value = resp.data.list; imgUrl.value = 'data:image/gif;base64,' + resp.data.image; diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 2892634..8ef66a5 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -128,7 +128,7 @@ const approvalRecordRef = ref>(); const leaveFormRef = ref(); const submitFormData = ref({ - businessKey: '', + businessId: '', flowCode: '', variables: {} }); @@ -245,7 +245,7 @@ const submitFlow = async () => { const handleStartWorkFlow = async (data: LeaveVO) => { try { submitFormData.value.flowCode = flowCode.value; - submitFormData.value.businessKey = data.id; + submitFormData.value.businessId = data.id; //流程变量 taskVariables.value = { leaveDays: data.leaveDays, diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 53dc06c..f76ef61 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -369,7 +369,7 @@ const cancelPopover = async (index: any) => { /** 查看按钮操作 */ const handleView = (row) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: 'view', formCustom: row.formCustom, diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index 37010c8..5aeeb50 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -231,7 +231,7 @@ const submitCallback = async (data) => { /** 查看按钮操作 */ const handleView = (row) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: 'view', formCustom: row.formCustom, diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index 3bba408..07f7111 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -243,7 +243,7 @@ const handleCancelProcessApply = async (businessId: string) => { //办理 const handleOpen = async (row, type) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: type, formCustom: row.formCustom, diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 5e1b346..6224fff 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -120,7 +120,7 @@ const getTaskCopyList = () => { /** 查看按钮操作 */ const handleView = (row) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: 'view', formCustom: row.formCustom, diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index f66dbba..298ddcf 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -152,7 +152,7 @@ const getFinishList = () => { /** 查看按钮操作 */ const handleView = (row: FlowTaskVO) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: 'view', formCustom: row.formCustom, diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index ece26a3..876e335 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -154,7 +154,7 @@ const getWaitingList = () => { //办理 const handleOpen = async (row: FlowTaskVO) => { const routerJumpVo = reactive({ - businessKey: row.businessId, + businessId: row.businessId, taskId: row.id, type: 'approval', formCustom: row.formCustom,