diff --git a/src/components/Application/src/UserTenantChange.vue b/src/components/Application/src/UserTenantChange.vue index 057c45f..d61a481 100644 --- a/src/components/Application/src/UserTenantChange.vue +++ b/src/components/Application/src/UserTenantChange.vue @@ -75,7 +75,8 @@ } async function toggleLocale(lang: string) { appStore.setPageLoadingAction(true); - let res = await changeTenant(lang); + let res = await changeTenant(lang); + permissionStore.setDynamicAddedRoute(false); await userStore.afterLoginAction(true); closeAll(); await setupRouterGuard(router); diff --git a/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue b/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue index f54ab21..baf259c 100644 --- a/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue +++ b/src/views/workflow/task/components/processTasks/ToDoTasksV2.vue @@ -51,7 +51,7 @@ const appStore = useAppStore(); const userStore = useUserStore(); const { userInfo } = storeToRefs(userStore); - const { closeAll } = useTabs(router); + const { closeOther } = useTabs(router); const permissionStore = usePermissionStore(); const { getShowTopMenu } = useMenuSetting(); const { getIsMobile } = useAppInject(); @@ -209,8 +209,9 @@ async function toggleLocale(tenantCode: string) { appStore.setPageLoadingAction(true); await changeTenant(tenantCode); - await userStore.afterLoginAction(true); - closeAll(); + permissionStore.setDynamicAddedRoute(false); + await userStore.afterLoginAction(false); + closeOther(); await setupRouterGuard(router); await permissionStore.changeSubsystem(getShowTopMenu.value, getIsMobile.value); if(permissionStore.getSubSysList.length>0){