แก้เช็คและ loading สรรหา

src/modules/03_recruiting/views/01_compete/Period.vue

@@ -201,7 +201,7 @@ async function fetchData(actionType?: string) {
     .finally(() => {
       hideLoader();
       if (actionType == "delete") {
-        success($q, "ลบข้อมูลการสอบสำเร็จ");
+        success($q, "ลบข้อมูลสำเร็จ");
       }
     });
 }

src/modules/03_recruiting/views/01_compete/PeriodAdd.vue

@@ -127,32 +127,22 @@ async function fileRemoveDoc(files: any) {
 
 /** อัพโหลด เอกสาร */
 async function uploadDocData() {
-  const formData = new FormData();
   if (fileDocDataUpload.value.length > 0) {
+    const formData = new FormData();
     fileDocDataUpload.value.forEach((file: any) => {
       formData.append("", file);
     });
-    showLoader();
     await http
       .put(config.API.periodRecruitDoc(id.value), formData)
       .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
+        return true;
       })
       .catch((e) => {
         messageError($q, e);
-      })
-      .finally(async () => {
-        hideLoader();
-        setTimeout(async () => {
-          await clickBack();
-        }, 1200);
+        return false;
       });
-  } else {
-    success($q, "บันทึกข้อมูลสำเร็จ");
-    setTimeout(async () => {
-      await clickBack();
-    }, 1200);
   }
+  return true;
 }
 
 /** อัปโหลด รูปภาพ */
@@ -162,17 +152,17 @@ async function uploadImgData() {
     fileImgDataUpload.value.forEach((file: any) => {
       formData.append("", file);
     });
-    showLoader();
     await http
       .put(config.API.periodRecruitImg(id.value), formData)
-      .then(() => {})
+      .then(() => {
+        return true;
+      })
       .catch((e) => {
         messageError($q, e);
-      })
-      .finally(async () => {
-        hideLoader();
+        return false;
       });
   }
+  return true;
 }
 
 /** อัพโหลดไฟล์ immg */
@@ -312,8 +302,12 @@ async function addData() {
     .then(async (res) => {
       const data = res.data.result;
       id.value = data.id;
-      await uploadImgData();
-      await uploadDocData();
+      const imgUploadResult = await uploadImgData();
+      const docUploadResult = await uploadDocData();
+      if (imgUploadResult && docUploadResult) {
+        success($q, "บันทึกรอบสอบแข่งขันสำเร็จ");
+        await clickBack();
+      }
     })
     .catch((e) => {
       messageError($q, e);
@@ -332,8 +326,12 @@ async function editData(id: string) {
   await http
     .put(config.API.editPeriod(id), sendData())
     .then(async () => {
-      await uploadImgData();
-      await uploadDocData();
+      const imgUploadResult = await uploadImgData();
+      const docUploadResult = await uploadDocData();
+      if (imgUploadResult && docUploadResult) {
+        success($q, "แก้ไขรอบสอบแข่งขันสำเร็จ");
+        await clickBack();
+      }
     })
     .catch((e) => {
       messageError($q, e);