From d03c7f35fe5d971e16a1026c2ee280af3a284e01 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 2 Oct 2025 16:58:45 +0700
Subject: [PATCH] fix(history): search year

---
 src/components/ToolBar.vue | 33 ++++++++++++++++++---------------
 src/views/HistoryView.vue  | 16 +++++-----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/components/ToolBar.vue b/src/components/ToolBar.vue
index b913c4f..5710104 100644
--- a/src/components/ToolBar.vue
+++ b/src/components/ToolBar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 import { useCounterMixin } from '@/stores/mixin'
 import { useChekIn } from '@/stores/chekin'
@@ -27,14 +27,11 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:year'])
 
-const filterYear = ref<number>(
-  stores.year ? stores.year : calculateFiscalYear(new Date())
-) //ปีงบประมาณ
+const filterYear = ref<number>(calculateFiscalYear(new Date())) //ปีงบประมาณ
 const titleName = ref<string>('เพิ่มรายการลงเวลากรณีพิเศษ') //หัว popup
 const dateMonth = ref<DataDateMonthObject>({
   month: new Date().getMonth(),
-  year:
-    stores.year && !isNaN(stores.year) ? stores.year : new Date().getFullYear(),
+  year: new Date().getFullYear(),
 })
 const modalPopup = ref<boolean>(false) // modal เพิ่มรายการลงเวลากรณีพิเศษ
 
@@ -46,6 +43,8 @@ function filterYearFn(type: string) {
   const year = type === 'year' ? filterYear.value : dateMonth.value.year
   const month = dateMonth.value.month
 
+  console.log(year, month)
+
   // ตรวจสอบค่าก่อนส่ง
   if (isNaN(Number(year)) || isNaN(Number(month))) {
     console.warn('Invalid year or month value:', { year, month })
@@ -91,15 +90,19 @@ const monthYearThai = (val: DataDateMonthObject) => {
   return monthYear2Thai(month, year)
 }
 
-/**
- * watch การเปลี่ยนแปลงของ stores.year
- */
-watch(
-  () => stores.year,
-  (newYear) => {
-    dateMonth.value.year = newYear
-  }
-)
+onMounted(() => {
+  filterYearFn(props.tab === 'history' ? 'year' : 'month')
+})
+
+// /**
+//  * watch การเปลี่ยนแปลงของ stores.year
+//  */
+// watch(
+//   () => stores.year,
+//   (newYear) => {
+//     dateMonth.value.year = newYear
+//   }
+// )
 </script>
 <template>
   <div class="items-center col-12 row q-pb-sm">
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index aa19cea..a2f007f 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -7,6 +7,7 @@ import http from '@/plugins/http'
 import config from '@/app.config'
 import { useChekIn } from '@/stores/chekin'
 import { useCounterMixin } from '@/stores/mixin'
+import { calculateFiscalYear } from '@/utils/function'
 
 import TableHistory from '@/components/TableHistory.vue' //ตารางประวัติการลงเวลา
 import ToolBar from '@/components/ToolBar.vue' // เมนู Herder
@@ -17,8 +18,9 @@ const stores = useChekIn()
 const { showLoader, hideLoader, messageError } = useCounterMixin()
 const { fetchHistoryList } = stores
 
-const year = ref<number>(new Date().getFullYear()) // ปีงบปรมาณ
+const year = ref<number>(calculateFiscalYear(new Date())) // ปีงบปรมาณ
 const month = ref<number>(new Date().getMonth()) // เดือน
+const year2 = ref<number>(new Date().getFullYear()) // ปีงบปรมาณ
 const page = ref<number>(1) // หน้าปัจจุบัน
 const pageSize = ref<number>(10) // จำนวนแถวต่อหน้า
 const total = ref<number>(0) // จำนวนทั้งหมด
@@ -81,7 +83,7 @@ async function fetchlistTime() {
   await http
     .get(
       config.API.historyTime() +
-        `?year=${year.value}&month=${month.value + 1}&page=${
+        `?year=${year2.value}&month=${month.value + 1}&page=${
           page.value
         }&pageSize=${pageSize.value}&keyword=${
           filter.value ? filter.value : ''
@@ -111,9 +113,8 @@ async function fetchlistTime() {
  * @param m เดือนที่ต้องการอัปเดต
  */
 async function updateYear(y: number, m: number) {
-  year.value = y
+  stores.tab === 'history' ? (year.value = y) : (year2.value = y)
   month.value = m
-  stores.year = y
   await functionFetch() // เรียกใช้งานฟังก์ชัน functionFetch เพื่อดึงข้อมูลใหม่
 }
 
@@ -127,15 +128,8 @@ watch(
   () => {
     page.value = 1
     filter.value = ''
-    functionFetch()
   }
 )
-/**
- * Hook
- */
-onMounted(() => {
-  functionFetch()
-})
 </script>
 
 <template>