diff --git a/src/components/ToolBar.vue b/src/components/ToolBar.vue
index 587b7a0..bdf7922 100644
--- a/src/components/ToolBar.vue
+++ b/src/components/ToolBar.vue
@@ -26,7 +26,9 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:year'])
 
-const filterYear = ref<number>(stores.year) //ปีงบประมาณ
+const filterYear = ref<number>(
+  stores.year ? stores.year : new Date().getFullYear()
+) //ปีงบประมาณ
 const titleName = ref<string>('เพิ่มรายการลงเวลากรณีพิเศษ') //หัว popup
 const dateMonth = ref<DataDateMonthObject>({
   month: new Date().getMonth(),
@@ -92,16 +94,18 @@ watch(
       :enableTimePicker="false"
       @update:modelValue="filterYearFn('year')"
     >
-      <template #year="{ year }">{{ year + 543 }}</template>
+      <template #year="{ year }">{{
+        Number.isFinite(year) ? year + 543 : ''
+      }}</template>
       <template #year-overlay-value="{ value }">{{
-        parseInt(value + 543)
+        Number.isFinite(parseInt(value)) ? parseInt(value) + 543 : ''
       }}</template>
       <template #trigger>
         <q-input
           dense
           lazy-rules
           outlined
-          :model-value="filterYear + 543"
+          :model-value="filterYear ? filterYear + 543 : ''"
           :label="`${'ปีงบประมาณ'}`"
         >
           <template v-slot:prepend>
@@ -128,9 +132,11 @@ watch(
       :enableTimePicker="false"
       @update:modelValue="filterYearFn('mount')"
     >
-      <template #year="{ year }">{{ year + 543 }}</template>
+      <template #year="{ year }">{{
+        Number.isFinite(year) ? year + 543 : ''
+      }}</template>
       <template #year-overlay-value="{ value }">{{
-        parseInt(value + 543)
+        Number.isFinite(parseInt(value)) ? parseInt(value) + 543 : ''
       }}</template>
       <template #trigger>
         <q-input