diff --git a/src/components/FormTime.vue b/src/components/FormTime.vue
index 51a19b7..ccc9397 100644
--- a/src/components/FormTime.vue
+++ b/src/components/FormTime.vue
@@ -35,7 +35,7 @@ const props = defineProps({
 })
 
 const dataByIdVal = ref<any>([])
-const date = ref<Date | null | string>(null)
+const date = ref<Date | string>(new Date())
 const checkboxIn = ref<boolean>(false)
 const checkboxOut = ref<boolean>(false)
 const reason = ref<string>('')
@@ -166,6 +166,7 @@ watch(
             week-start="0"
             autoApply
             outlined
+            lazy-rules
           >
             <template #year="{ year }">
               {{ year + 543 }}
@@ -181,9 +182,9 @@ watch(
                 dense
                 :model-value="date !== null ? date2Thai(new Date(date)) : null"
                 :label="`${'วันที่ขอแก้ไข'}`"
-                :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                 format-header="YYYY-MM-DD"
                 lazy-rules
+                :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                 hide-bottom-space
               >
                 <template v-slot:prepend>
diff --git a/src/components/PopUp.vue b/src/components/PopUp.vue
index e103c73..d7758e4 100644
--- a/src/components/PopUp.vue
+++ b/src/components/PopUp.vue
@@ -40,7 +40,7 @@ watch(
 )
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card class="column" style="width: 300px; min-height: 600px">
       <HeaderPopup :title="props.title" :clickClose="clickClosePopup" />
       <FormTime
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index 2612fc1..6336b0a 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -44,7 +44,6 @@ async function changePage(pageVal: number, pageSizeVal: number, key: string) {
 }
 
 function functionFetch() {
-  console.log(stores.tab)
   stores.tab === 'history' ? fetchlistHistory() : fetchlistTime()
 }
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index bb6621c..795cd6d 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -236,9 +236,7 @@ function validateForm() {
   }
   if (hasError.every((result) => result === true)) {
     confirm()
-  } else {
-    console.log('ไม่ผ่าน ')
-  }
+  } 
 }
 
 const timeChickin = ref<string>()