diff --git a/src/interface/response/main.ts b/src/interface/response/main.ts index e49121332..561af060e 100644 --- a/src/interface/response/main.ts +++ b/src/interface/response/main.ts @@ -43,4 +43,4 @@ interface DataRoles { parentNode: string; } -export type { ListMenu, ChildLevelTree, ChildConfig, DataPermissions }; +export type { ListMenu, ChildLevelTree, ChildConfig, DataPermissions,DataRoles }; diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue index 3f1714a2f..b88875f34 100644 --- a/src/modules/21_report/views/02_reportRegistry.vue +++ b/src/modules/21_report/views/02_reportRegistry.vue @@ -6,7 +6,7 @@ import * as XLSX from "xlsx"; import http from "@/plugins/http"; import config from "@/app.config"; import { useRoute } from "vue-router"; -import { checkPermission } from "@/utils/permissions"; +import { checkPermission, checkPermissionGet } from "@/utils/permissions"; import { useCounterMixin } from "@/stores/mixin"; import { useReportStore } from "@/modules/21_report/store"; import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store"; @@ -22,6 +22,8 @@ import type { ResOptionPerson, DataEducationLevel, } from "@/modules/21_report/interface/Main"; +import type { DataRoles } from "@/interface/response/main"; +import type { DataStructureTree } from "@/interface/main"; import DialogOrg from "@/modules/21_report/components/01_org/DialogOrg.vue"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; @@ -637,15 +639,29 @@ watch( } ); -const node = ref([]); +const node = ref([]); const filterTree = ref(""); const expanded = ref([]); const expandedModal = ref(false); +// const sysName = ref async function fetchTree() { - const data = await fetchStructureTree('SYS_REGISTRY_OFFICER' as string, true); - if (data) { - node.value = data; + try { + const res = await http.get(config.API.orgPermissionsSys); + const response = res.data.result.roles; + + const sysName = response.find( + (e: DataRoles) => + e.authSysId === "SYS_REGISTRY_OFFICER" || + e.authSysId === "REPORT_REGISTRY" + )?.authSysId; + + const data = await fetchStructureTree(sysName ?? "REPORT_REGISTRY", true); + if (data) { + node.value = data; + } + } catch (err) { + messageError($q, err); } } @@ -1601,8 +1617,12 @@ onMounted(async () => {
{{ col.value }}