From 7c60c42cb0836adb398d12742b3af4a435f73ab1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 8 Sep 2023 10:31:29 +0700 Subject: [PATCH 1/2] =?UTF-8?q?stroes=20roleUser=20,=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B4?= =?UTF-8?q?=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../10_order/components/step/step01.vue | 4 +- src/stores/roleUser.ts | 41 +++++++++++++++++++ src/views/MainLayout.vue | 14 +++++-- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 src/stores/roleUser.ts 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}`); From b40a6213301d5cb11abd780ee21fb0a739a7ee59 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 8 Sep 2023 10:47:22 +0700 Subject: [PATCH 2/2] =?UTF-8?q?avatar=20=E0=B8=97=E0=B8=94=E0=B8=A5?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/probation/ProbationDetail.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue index cd1e9bfa6..3c3b58434 100644 --- a/src/modules/05_placement/components/probation/ProbationDetail.vue +++ b/src/modules/05_placement/components/probation/ProbationDetail.vue @@ -29,6 +29,7 @@ const position_level = ref(""); const organization = ref(""); const probation_status = ref(""); const probation_statusold = ref(""); +const avatarprofile = ref(""); const visibleColumns = ref([ "no", @@ -152,12 +153,14 @@ const getpersonalList = async () => { .get(config.API.personal(personalId.value)) .then((res) => { const data = res.data.data; + // console.log(data); name.value = data.name; position_line.value = data.position_line; position_level.value = data.position_level; organization.value = data.organization; probation_status.value = data.probation_status; probation_statusold.value = data.probation_status; + avatarprofile.value = data.avatar; }) .catch(() => {}) .finally(() => { @@ -250,7 +253,8 @@ const paginationLabel = (start: string, end: string, total: string) => {
- + +