diff --git a/src/components/FormTime.vue b/src/components/FormTime.vue
index 0f441b8..d77ef68 100644
--- a/src/components/FormTime.vue
+++ b/src/components/FormTime.vue
@@ -23,7 +23,7 @@ const props = defineProps({
   },
 })
 
-const dataById = ref<any>([])
+const dataByIdVal = ref<any>([])
 const date = ref<Date | null>(null)
 const checkboxIn = ref<boolean>(false)
 const checkboxOut = ref<boolean>(false)
@@ -32,8 +32,8 @@ const statusAction = ref<boolean>(false)
 
 onMounted(() => {
   updateClock()
-  dataById.value = props.dataById
-  if (dataById.value == null) {
+  dataByIdVal.value = props.dataById
+  if (dataByIdVal.value == null) {
     statusAction.value = true
   }
 })
@@ -159,7 +159,7 @@ watch(
           <div class="col-1">
             <q-icon color="grey-5" name="calendar_today" />
           </div>
-          <div class="col">{{ covertDateObject(dataById.date) }}</div>
+          <div class="col">{{ covertDateObject(dataByIdVal.date) }}</div>
         </div>
       </q-card>
 
@@ -191,6 +191,7 @@ watch(
           </div>
         </div>
       </q-card>
+
       <div
         v-if="checkstatusBox"
         class="text-red-9 q-pa-sm"
@@ -198,6 +199,7 @@ watch(
       >
         กรุณาเลือก
       </div>
+      
       <q-card flat bordered class="q-pa-sm col-12 q-mt-sm">
         <q-input
           ref="reasonRef"
@@ -206,7 +208,7 @@ watch(
           v-model="reason"
           label="เหตุผล"
           type="textarea"
-          :rows="$q.screen.gt.xs ? '5' : '1'"
+          :rows="4"
           label-color="grey-5"
           :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
           lazy-rules
diff --git a/src/components/PopUp.vue b/src/components/PopUp.vue
index d5bdc63..4227ef6 100644
--- a/src/components/PopUp.vue
+++ b/src/components/PopUp.vue
@@ -34,8 +34,8 @@ watch(props, () => {
 })
 </script>
 <template>
-  <q-dialog v-model="props.modal" full-height>
-    <q-card class="column full-height" style="width: 300px">
+  <q-dialog v-model="props.modal">
+    <q-card class="column" style="width: 300px; min-height: 600px;">
       <HeaderPopup :title="props.title" :clickClose="clickClosePopup" />
       <FormTime :dataById="data" :closePopup="clickClosePopup" />
     </q-card>
diff --git a/src/components/ToolBar.vue b/src/components/ToolBar.vue
index 30d38c9..94a68e0 100644
--- a/src/components/ToolBar.vue
+++ b/src/components/ToolBar.vue
@@ -5,7 +5,7 @@ import Popup from '@/components/PopUp.vue'
 // import HeaderPopup from "@/components/HeaderPopup.vue";
 // import FormTime from "@/components/FormTime.vue";
 
-const filterYear = ref<string>('')
+const filterYear = ref<number>(new Date().getFullYear() + 543)
 const yearOption = ref<DataOption[]>([{ id: '2566', name: '2566' }])
 const titleName = ref<string>('เพิ่มรายการลงเวลากรณีพิเศษ')
 
@@ -24,7 +24,7 @@ function onClickClose() {
         dense
         outlined
         style="width: 180px"
-        label="ปีประวัติลงเวลา"
+        label="ปีงบประมาณ"
         v-model="filterYear"
         :options="yearOption"
         option-label="name"