fix bug ลา

src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue

@@ -60,48 +60,34 @@ const formRef: RehabilitationForm = {
 };
 
 /** ฟังก์ชั่นตรวจสอบความถูกต้องก่อน บันทึก */
-function onValidate() {
-  const hasError = [];
-  for (const key in formRef) {
-    if (Object.prototype.hasOwnProperty.call(formRef, key)) {
-      const property = formRef[key];
-      if (property.value && typeof property.value.validate === "function") {
-        const isValid = property.value.validate();
-        hasError.push(isValid);
-      }
-    }
+async function onValidate() {
+  const formData = new FormData();
+  if (formDataRehabilitation.leaveDocument.length > 0) {
+    formDataRehabilitation.leaveDocument.forEach((file: File) => {
+      formData.append("leaveDocument", file);
+    });
   }
-  if (hasError.every((result) => result === true)) {
-    const formData = new FormData();
 
-    if (formDataRehabilitation.leaveDocument.length > 0) {
-      formDataRehabilitation.leaveDocument.forEach((file: File) => {
-        formData.append("leaveDocument", file);
-      });
-      // formData.append("leaveDocument", formDataRehabilitation.leaveDocument)
-    }
-
-    if (formDataRehabilitation.leaveDraftDocument) {
-      formData.append(
-        "leaveDraftDocument",
-        formDataRehabilitation.leaveDraftDocument
-      );
-    }
-
-    formData.append("type", formDataRehabilitation.type); //
+  if (formDataRehabilitation.leaveDraftDocument) {
     formData.append(
-      "leaveStartDate",
-      dateToISO(new Date(formDataRehabilitation.leaveStartDate))
-    ); //
-    formData.append(
-      "leaveEndDate",
-      dateToISO(new Date(formDataRehabilitation.leaveEndDate))
+      "leaveDraftDocument",
+      formDataRehabilitation.leaveDraftDocument
     );
-    formData.append("leaveWrote", formDataRehabilitation.leaveWrote); //
-    formData.append("leaveDetail", formDataRehabilitation.leaveDetail); //
-    formData.append("leaveTotal", formDataRehabilitation.leaveTotal); //
-    props.onSubmit(formData, isLeave.value);
   }
+
+  formData.append("type", formDataRehabilitation.type); //
+  formData.append(
+    "leaveStartDate",
+    dateToISO(new Date(formDataRehabilitation.leaveStartDate))
+  );
+  formData.append(
+    "leaveEndDate",
+    dateToISO(new Date(formDataRehabilitation.leaveEndDate))
+  );
+  formData.append("leaveWrote", formDataRehabilitation.leaveWrote); //
+  formData.append("leaveDetail", formDataRehabilitation.leaveDetail); //
+  formData.append("leaveTotal", formDataRehabilitation.leaveTotal); //
+  props.onSubmit(formData, isLeave.value);
 }
 
 /** ส่วนของการประกาศและเลือกไฟล์เอกสารประกอบ */
@@ -118,6 +104,7 @@ const fileUploadDoc = async (files: any) => {
  */
 const isLeave = ref<boolean>(true);
 async function FetchCheck() {
+  showLoader();
   await http
     .post(config.API.leaveCheck(), {
       type: dataStore.typeId ?? null,
@@ -131,6 +118,9 @@ async function FetchCheck() {
     })
     .catch((e: any) => {
       messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
     });
 }
 
@@ -161,8 +151,6 @@ const leaveDocumentList = ref<any>();
 const leaveDraftDocument = ref<string>();
 const statusCheck = ref<string>("");
 watch(props.data, () => {
-  console.log(props.data);
-
   if (props.data) {
     formDataRehabilitation.leaveWrote = props.data.leaveWrote;
     formDataRehabilitation.leaveStartDate = new Date(props.data.leaveStartDate);
@@ -187,6 +175,7 @@ onMounted(() => {
     leaveDocumentList.value = props.data.leaveDocument;
     statusCheck.value = props.data.status;
     leaveId.value = props.data.id;
+    FetchCheck();
   }
 });
 </script>
@@ -196,7 +185,8 @@ onMounted(() => {
     <q-icon name="mdi-numeric-3-circle" size="20px" color="primary" />
     <div class="q-pl-sm text-weight-bold text-dark">กรอกข้อมูล</div>
   </div>
-  <form @submit.prevent="onValidate">
+
+  <q-form greedy @submit.prevent @validation-success="onValidate">
     <q-card bordered class="q-pa-md bg-grey-1">
       <div class="row q-pa-sm q-col-gutter-sm">
         <q-input
@@ -504,5 +494,5 @@ onMounted(() => {
         >
       </div>
     </div>
-  </form>
+  </q-form>
 </template>