diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index 0f5ce1b24b944d5e53d9253d38c8fd5d7004358b..696312e66e69126c75d215a3c1743ad7d5894258 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -8,7 +8,8 @@ export default { query: { id: routerJumpVo.businessId, type: routerJumpVo.type, - taskId: routerJumpVo.taskId + taskId: routerJumpVo.taskId, + instanceId: routerJumpVo.instanceId } }); } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 3e7a71d5654898799697661dac8142728d4f7312..2d091157bf8a133d3f4dd254cad72774a41d2ffe 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -4,6 +4,7 @@ export interface RouterJumpVo { type: string; formCustom: string; formPath: string; + instanceId: string | number; } export interface StartProcessBo { diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index e70d289be06b67324473e7787570e542f9477a16..96108f7d4c35e1effe79d89746d07a6beedd8462 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -3,7 +3,7 @@ - +
@@ -73,20 +73,18 @@ const loading = ref(false); const visible = ref(false); const historyList = ref>([]); const tabActiveName = ref('image'); -const imgUrl = ref(''); -const defJson = ref(''); +const insId = ref(null); //初始化查询审批记录 -const init = async (businessId: string | number) => { +const init = async (businessId: string | number, instanceId: string | number) => { visible.value = true; loading.value = true; tabActiveName.value = 'image'; historyList.value = []; + insId.value = instanceId; flowImage(businessId).then((resp) => { if (resp.data) { historyList.value = resp.data.list; - imgUrl.value = 'data:image/gif;base64,' + resp.data.image; - defJson.value = resp.data.defChart.defJson; if (historyList.value.length > 0) { historyList.value.forEach((item) => { if (item.ext) { diff --git a/src/components/Process/flowChart.vue b/src/components/Process/flowChart.vue index d5cd2c153ab434483c39542824f53fc3da21502a..f0afe466ab357ee9bd04b233e86f0bac5ab6e2a2 100644 --- a/src/components/Process/flowChart.vue +++ b/src/components/Process/flowChart.vue @@ -1,84 +1,29 @@