diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts index 360263b..ec34271 100644 --- a/src/api/bpm/model/index.ts +++ b/src/api/bpm/model/index.ts @@ -34,7 +34,7 @@ export const getModelPage = async (params) => { } export const getModel = async (id: number) => { - return await request.get({ url: '/bpm/model/get?id=' + id }) + return await request.get({ url: '/bpm/model/getmodel?id=' + id }) } export const updateModel = async (data: ModelVO) => { diff --git a/src/views/Home/kqnr/qjgl/qjsq/QjglCreate.vue b/src/views/Home/kqnr/qjgl/qjsq/QjglCreate.vue index feee5ad..90647cc 100644 --- a/src/views/Home/kqnr/qjgl/qjsq/QjglCreate.vue +++ b/src/views/Home/kqnr/qjgl/qjsq/QjglCreate.vue @@ -133,6 +133,7 @@ import ProcessInstanceSimpleViewer from "@/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue"; import ProcessInstanceBpmnViewer from "@/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue"; +import * as ProcessInstanceApi from "@/api/bpm/processInstance"; /** 请假管理 表单 */ defineOptions({ name: 'QjglCreate' }) @@ -189,7 +190,19 @@ function formatDateHour(dat: number|Date) { const date = new Date(dat) return date.getHours(); } +const getProcessModelView = async () => { + if (BpmModelType.BPMN === processDefinition.value?.modelType) { + // 重置,解决 BPMN 流程图刷新不会重新渲染问题 + processModelView.value = { + bpmnXml: '' + } + } + const data = await ProcessInstanceApi.getProcessInstanceBpmnModelView(processInstanceid) + if (data) { + processModelView.value = data + } +} //获取天数数据模型 const queryParamsDate = reactive({ pageNo: 1, @@ -439,7 +452,7 @@ onMounted(async () => { undefined, processKey ) - +console.log(processDefinitionDetail,"processDefinitionDetail") if (!processDefinitionDetail) { message.error('OA 请假的流程模型未配置,请检查!') return @@ -463,6 +476,7 @@ onMounted(async () => { //console.log(userList.value ,"userList.value") } await getNjglData() + await getProcessModelView() }) diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index b0b8680..8a98cf9 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -68,6 +68,13 @@ + + +