diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index 214a1798e..f6b15dc5b 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -2291,9 +2291,9 @@ const getClass = (val: boolean) => { :rules="[ (val) => !!val || - `${'กรุณากรอกครั่งที่ (เรื่องการดำเนินการทางวินัย)'}`, + `${'กรุณากรอกครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`, ]" - :label="`${'ครั่งที่ (เรื่องการดำเนินการทางวินัย)'}`" + :label="`${'ครั้งที่ (เรื่องการดำเนินการทางวินัย)'}`" hide-bottom-space /> diff --git a/src/stores/roleUser.ts b/src/stores/roleUser.ts new file mode 100644 index 000000000..8f8d8976e --- /dev/null +++ b/src/stores/roleUser.ts @@ -0,0 +1,41 @@ +import { defineStore } from "pinia"; +import { ref } from "vue"; + +export const useroleUserDataStore = defineStore("roleusers", () => { + const insignia1Role = ref(false) + const insignia2Role = ref(false) + const caregiverRole = ref(false) + const chairmanRole = ref(false) + const commanderRole = ref(false) + const admin2Role = ref(false) + const adminRole = ref(false) + const oligarchRole = ref(false) + + + + + const fetchroleUser = async (keycloak: any) => { + // console.log(keycloak); + if (keycloak != null) { + insignia1Role.value = await keycloak.includes("insignia1"); + insignia2Role.value = await keycloak.includes("insignia2"); + caregiverRole.value = await keycloak.includes("caregiver"); + chairmanRole.value = await keycloak.includes("chairman"); + commanderRole.value = await keycloak.includes("commander"); + admin2Role.value = await keycloak.includes("admin2"); + adminRole.value = await keycloak.includes("admin"); + oligarchRole.value = await keycloak.includes("oligarch"); + } + } + + return { + fetchroleUser, + insignia1Role, + insignia2Role, + caregiverRole, + chairmanRole, + commanderRole, + admin2Role, + adminRole, + }; +}); \ No newline at end of file diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index f7b19a81e..0f9fb6ebc 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -20,6 +20,7 @@ import { tabList, tabListPlacement, } from "../interface/request/main/main"; +import { useroleUserDataStore } from "@/stores/roleUser"; const { setVerticalScrollPosition, getVerticalScrollPosition } = scroll; const store = useDataStore(); @@ -35,6 +36,8 @@ const { messageError, date2Thai, } = mixin; +const DataStore = useroleUserDataStore(); +const { fetchroleUser } = DataStore; const $q = useQuasar(); const { tabData, loader } = storeToRefs(store); @@ -211,7 +214,8 @@ const activeBtn = () => { * ยังจับ boolean ผิด จึงต้อง set */ onMounted(async () => { - await getDataNotification(); + await fetchroleUser(keycloak.tokenParsed.role); + await getDataNotification(); myEventHandler(null, false); window.addEventListener("resize", (e: any) => { myEventHandler(e, true); @@ -266,9 +270,11 @@ const myEventHandler = (e: any, setSCroll: boolean) => { */ const activeMenu = (path: string) => { if (path == "dashboard" && route.fullPath == "/") return true; - if (path == "registry" && route.fullPath == "/registry-employee") return false; - if (path == "registry" && route.fullPath.includes(`/registry-employee/edit`)) return false; - + if (path == "registry" && route.fullPath == "/registry-employee") + return false; + if (path == "registry" && route.fullPath.includes(`/registry-employee/edit`)) + return false; + if (path == "registry" && route.fullPath == "/") return false; // if (path != "registry" && path == "registryEmployee" && route.fullPath == "/registryEmployee") return true; const bool = route.fullPath.includes(`/${path}`);