From b9cf252e368b21e20f04b0ff0b6bfd96fa65c895 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 18 Nov 2024 15:31:46 +0700 Subject: [PATCH 1/2] fixing landing page --- src/views/MainLayout.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 13b24ac..1cd9061 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -234,7 +234,8 @@ function onInfo() { } // landing page redirect -const landingPageUrl = () => { +const landingPageUrl = ref(getLandingUrl()); +function getLandingUrl() { if (window.location.hostname === "bmasso.bma.go.th") { return `${configParam.landingPageUrl}/landing?mode=dev`; } else if (window.location.hostname === "bma-ehr.frappet.com") { @@ -242,7 +243,7 @@ const landingPageUrl = () => { } else { return `${configParam.landingPageUrl}/landing?mode=dev`; } -}; +} From a2198b3302dc7f34ef25e37816de2b997e3024e8 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 18 Nov 2024 23:10:43 +0700 Subject: [PATCH 2/2] fixing label --- src/modules/05_leave/components/formDetail/01_SickForm.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/05_leave/components/formDetail/01_SickForm.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue index cf8a51a..1c9d53d 100644 --- a/src/modules/05_leave/components/formDetail/01_SickForm.vue +++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue @@ -50,9 +50,11 @@ const props = defineProps({
- ลาครั้งสุดท้ายในประเภทนั้น ๆ เมื่อวันที่ + ลาครั้งสุดท้ายเมื่อวันที่ +
+
+ {{ props.data.leaveLastStart ?? "-" }}
-
{{ props.data.leaveLastStart }}
หมายเลขที่ติดต่อขณะลา