diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts index 281eca92b..e23509aaa 100644 --- a/src/modules/09_leave/stores/SpecialTimeStore.ts +++ b/src/modules/09_leave/stores/SpecialTimeStore.ts @@ -104,6 +104,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => { }) .finally(() => { hideLoader(); + console.log(month.value); }); }; @@ -118,6 +119,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => { console.log(pageSize.value); fetchData(); + console.log("page"); } //--------------|ฟิลเตอร์|--------------------------------------// diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/SpecialTimeMain.vue index 3868106c5..bfb17f3fe 100644 --- a/src/modules/09_leave/views/SpecialTimeMain.vue +++ b/src/modules/09_leave/views/SpecialTimeMain.vue @@ -140,12 +140,6 @@ function filterFn() { dataSpecialTime.fetchData(); } -/**Hook */ -onMounted(async () => { - console.log("test"); - await dataSpecialTime.fetchData(); -}); - /** Function Date */ const dateMonth = ref({ month: new Date().getMonth(), @@ -159,10 +153,22 @@ const updateMonth = async (e: DataDateMonthObject) => { dataSpecialTime.month = dateMonth.value.month + 1; dataSpecialTime.year = dateMonth.value.year; // filterKeyword.value = ""; + await dataSpecialTime.fetchData(); + console.log(dateMonth); } - await dataSpecialTime.fetchData(); }; +/**Hook */ +onMounted(async () => { + //อัพเดทเป็นวันปัจจุบันเมื่อเข้าหน้านี้ + const toDay = ref(new Date()); + const monthToday = toDay.value.getMonth(); + const yearToday = toDay.value.getFullYear(); + dataSpecialTime.month = monthToday + 1; + dataSpecialTime.year = yearToday; + await dataSpecialTime.fetchData(); +}); + //แปลงเดือนเป็นไทย const monthYearThai = (val: any) => { if (val == null) return ""; @@ -255,7 +261,6 @@ const monthYearThai = (val: any) => {