diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue index 3ec44f7..05e6538 100644 --- a/src/views/workflow/processDefinition/design.vue +++ b/src/views/workflow/processDefinition/design.vue @@ -29,7 +29,7 @@ const open = async (definitionId, disabled) => { }; /** 关闭按钮 */ function close() { - const obj = { path: '/workflow/processDefinition' }; + const obj = { path: '/workflow/processDefinition', query: {activeName: proxy.$route.query.activeName}}; proxy.$tab.closeOpenPage(obj); } diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index cd40266..9888892 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -56,7 +56,7 @@ 导出 - + @@ -261,7 +261,7 @@ const form = ref({ formPath: '' }); onMounted(() => { - handleQuery(); + getPageList(); getTreeselect(); }); @@ -324,6 +324,10 @@ const handleSelectionChange = (selection: any) => { }; //分页 const getPageList = async () => { + console.log(proxy.$route.query.activeName) + if (proxy.$route.query.activeName) { + activeName.value = proxy.$route.query.activeName; + } if (activeName.value === '0') { getList(); } else { @@ -430,7 +434,8 @@ const design = async (row: FlowDefinitionVo) => { path: `/workflow/design/index`, query: { definitionId: row.id, - disabled: false + disabled: false, + activeName: activeName.value } }); }; @@ -444,7 +449,8 @@ const designView = async (row: FlowDefinitionVo) => { path: `/workflow/design/index`, query: { definitionId: row.id, - disabled: true + disabled: true, + activeName: activeName.value } }); };