diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 46d808300..cc2d130d0 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -37,7 +37,7 @@ const route = useRoute();
 const {
   date2Thai,
   success,
-
+  convertDatetimeToAPI,
   messageError,
   showLoader,
   hideLoader,
@@ -276,7 +276,7 @@ async function fetchData() {
       dateExam.value = data.examDate != null ? new Date(data.examDate) : null;
       dateRegister.value =
         data.registerStartDate != null && data.registerEndDate != null
-          ? [new Date(data.registerStartDate), new Date(data.registerEndDate)]
+          ? [data.registerStartDate, data.registerEndDate]
           : null;
       if (data.fee == 0) {
         data.paymentStartDate = null;
@@ -446,11 +446,11 @@ function sendData() {
     positionExam: positionData,
     registerEndDate:
       dateRegister.value != null
-        ? convertDateToAPI(dateRegister.value[1])
+        ? convertDatetimeToAPI(dateRegister.value[1])
         : null,
     registerStartDate:
       dateRegister.value != null
-        ? convertDateToAPI(dateRegister.value[0])
+        ? convertDatetimeToAPI(dateRegister.value[0])
         : null,
     round: round.value,
     year: yearly.value,
@@ -475,7 +475,6 @@ async function addData() {
       const uploadDoc = await uploadDocData();
       const uploadBarCode = await uploadBarCodes();
       const uploadQrCode = await uploadQrCodes();
-      hideLoader();
 
       if (uploadImg && uploadDoc && uploadBarCode && uploadQrCode) {
         success($q, "บันทึกรอบคัดเลือกสำเร็จ");
@@ -484,9 +483,10 @@ async function addData() {
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(async () => {});
+    .finally(async () => {
+      hideLoader();
+    });
 }
 
 /**
@@ -502,20 +502,18 @@ async function editData(id: string) {
       const uploadDoc = await uploadDocData();
       const uploadBarCode = await uploadBarCodes();
       const uploadQrCode = await uploadQrCodes();
-      hideLoader();
-
-      console.log(uploadImg, uploadDoc, uploadBarCode, uploadQrCode);
 
       if (uploadImg && uploadDoc && uploadBarCode && uploadQrCode) {
         success($q, "แก้ไขรอบคัดเลือกสำเร็จ");
-        await clickBack();
+        clickBack();
       }
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
@@ -1095,7 +1093,6 @@ onMounted(async () => {
               :readonly="checkRoutePermisson"
               borderless
               range
-              :enableTimePicker="false"
               week-start="0"
             >
               <template #year="{ year }">