From c66a18fea4ac46b7ff17cdbc0a4a88a055874bb0 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 7 Nov 2023 13:48:17 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B8=8B=E0=B9=88=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=A5=E0=B8=87=E0=B9=80?= =?UTF-8?q?=E0=B8=A7=E0=B8=A5=E0=B8=B2=20=E0=B9=80=E0=B8=9E=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=B2=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2=E0=B9=84?= =?UTF-8?q?=E0=B8=9B=E0=B8=97=E0=B8=B5=E0=B9=88=20checkin=20=E0=B9=81?= =?UTF-8?q?=E0=B8=A5=E0=B9=89=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MainLayout.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 518c2e8..1cec21a 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -96,8 +96,8 @@ const doLogout = () => { dense inline-label class="text-grey-5 tabsHome"> - + From 973664a0cddb53b72cc99ec196bb621a3b1314f8 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 7 Nov 2023 13:56:35 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B8=9B?= =?UTF-8?q?=E0=B8=8E=E0=B8=B4=E0=B8=97=E0=B8=B4=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/componenst/Calendar.vue | 12 +++++++----- src/modules/05_leave/views/Main.vue | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/05_leave/componenst/Calendar.vue b/src/modules/05_leave/componenst/Calendar.vue index 8ef649f..ab97329 100644 --- a/src/modules/05_leave/componenst/Calendar.vue +++ b/src/modules/05_leave/componenst/Calendar.vue @@ -151,11 +151,11 @@ const props = defineProps({ type: Number, default: () => new Date().getMonth(), }, - refreshData: { - //หน้า main มีการอัพเดทค่าให้ refresh data - type: Boolean, - required: true, - }, + // refreshData: { + // //หน้า main มีการอัพเดทค่าให้ refresh data + // type: Boolean, + // required: true, + // }, fetchDataSummaryCalendar: { //ฟังก์ชันอัพเดทสรุปวันหยุด type: Function, @@ -177,7 +177,9 @@ onMounted(async () => { * ค่า props(วันเดือนปีที่เลือก) ตอนอัพเดท ค่าฏิทินให้อัพเดทใหม่ */ watch(props, async (count, prevCount) => { + const calen = fullCalendar.value.getApi() const date = new Date(props.dateYear, props.dateMonth) + calen.gotoDate(date) }) const cancel = async (text: string) => { title.value = text diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 5ddfad4..f6d438e 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -97,7 +97,7 @@
- +
From 3bdec6d3f9e64fd868625ee8cdf9fe958fe51f54 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 7 Nov 2023 15:05:19 +0700 Subject: [PATCH 3/3] example form leave --- .../05_leave/componenst/Forms/01_SickForm.vue | 24 +++++++ .../componenst/Forms/04_HelpWifeBirthForm.vue | 27 ++++++++ src/modules/05_leave/router.ts | 10 +++ src/modules/05_leave/views/SampleForm.vue | 64 +++++++++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 src/modules/05_leave/componenst/Forms/01_SickForm.vue create mode 100644 src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue create mode 100644 src/modules/05_leave/views/SampleForm.vue diff --git a/src/modules/05_leave/componenst/Forms/01_SickForm.vue b/src/modules/05_leave/componenst/Forms/01_SickForm.vue new file mode 100644 index 0000000..a9a018c --- /dev/null +++ b/src/modules/05_leave/componenst/Forms/01_SickForm.vue @@ -0,0 +1,24 @@ + + + diff --git a/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue new file mode 100644 index 0000000..3d35c91 --- /dev/null +++ b/src/modules/05_leave/componenst/Forms/04_HelpWifeBirthForm.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/modules/05_leave/router.ts b/src/modules/05_leave/router.ts index 777a84b..f48dfee 100644 --- a/src/modules/05_leave/router.ts +++ b/src/modules/05_leave/router.ts @@ -4,6 +4,7 @@ const leave = () => import("@/modules/05_leave/views/Main.vue") const addAbsence = () => import("@/modules/05_leave/componenst/addAbsence.vue") +const samplePage = () => import("@/modules/05_leave/views/SampleForm.vue") /* const Checkout = () => import("@/modules/04_checkin/views/Checkout.vue"); */ @@ -26,4 +27,13 @@ export default [ Key: [7], }, }, + { + path: "/leave/sample", + name: "sample-page", + component: samplePage, + meta: { + Auth: true, + Key: [7], + }, + }, ] diff --git a/src/modules/05_leave/views/SampleForm.vue b/src/modules/05_leave/views/SampleForm.vue new file mode 100644 index 0000000..8787429 --- /dev/null +++ b/src/modules/05_leave/views/SampleForm.vue @@ -0,0 +1,64 @@ + + +