Merge branch 'develop' into dev

* develop:
  fix:bug  router(-1)

src/modules/03_recruiting/components/TableCandidate.vue

@@ -204,7 +204,6 @@ async function candidateToPlacement() {
         })
         .finally(async () => {
           hideLoader();
-          router.go(-1);
         });
     })
     .onCancel(() => {})
@@ -238,7 +237,7 @@ async function uploadDataPoint() {
     .put(config.API.periodExamUploadPoint(examId.value), formData)
     .then(() => {
       success($q, "อัพเดทคะแนนสอบสำเร็จ");
-      files.value = [];
+      props.fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -246,7 +245,6 @@ async function uploadDataPoint() {
     .finally(async () => {
       hideLoader();
       files.value = [];
-      props.fetchData();
     });
 }
 
@@ -294,6 +292,7 @@ async function checkCandidates() {
     })
     .then(() => {
       success($q, "ตรวจสอบข้อมูลสำเร็จ");
+      props.fetchData();
       selected.value = [];
     })
     .catch((e) => {
@@ -301,21 +300,20 @@ async function checkCandidates() {
     })
     .finally(() => {
       hideLoader();
-      props.fetchData();
     });
 }
 
-async function downloadFilePDF(res: string, fileName: string) {
-  const link = document.createElement("a");
-  link.href = window.URL.createObjectURL(
-    new Blob([res], {
-      type: "application/vnd.ms-excel",
-    })
-  );
-  link.setAttribute("download", fileName);
-  document.body.appendChild(link);
-  link.click();
-}
+// async function downloadFilePDF(res: string, fileName: string) {
+//   const link = document.createElement("a");
+//   link.href = window.URL.createObjectURL(
+//     new Blob([res], {
+//       type: "application/vnd.ms-excel",
+//     })
+//   );
+//   link.setAttribute("download", fileName);
+//   document.body.appendChild(link);
+//   link.click();
+// }
 
 async function candidateCheckProfileDialog() {
   dialogMessage(
@@ -365,10 +363,10 @@ async function clickPassExam() {
   showLoader();
   await http
     .get(config.API.exportExamPassExamList(examId.value))
-    .then(async(res) => {
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
-      await genReport(data, data.reportName,'pdf');
+      await genReport(data, data.reportName, "pdf");
     })
     .catch((e) => {
       messageError($q, e);
@@ -382,10 +380,10 @@ async function clickCandidateList() {
   showLoader();
   await http
     .get(config.API.exportExamCandidateList(examId.value))
-    .then(async(res) => {
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
-      await genReport(data, data.reportName,'pdf');
+      await genReport(data, data.reportName, "pdf");
     })
     .catch((e) => {
       messageError($q, e);

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

@@ -20,8 +20,14 @@ const $q = useQuasar();
 const router = useRouter();
 const route = useRoute();
 const mixin = useCounterMixin();
-const { messageError, success, showLoader, hideLoader, onSearchDataTable,convertDateToAPI } =
-  mixin;
+const {
+  messageError,
+  success,
+  showLoader,
+  hideLoader,
+  onSearchDataTable,
+  convertDateToAPI,
+} = mixin;
 
 const initialPagination = ref<Pagination>({
   page: 1,
@@ -375,7 +381,6 @@ function onSubmitCandidates(date: Date) {
         .then(() => {
           success($q, "นำผู้ผ่านสอบแข่งขันเข้าสู่ระบบบรรจุ");
           modalCandidates.value = false;
-          // router.go(-1);
         })
         .catch((e) => {
           messageError($q, e);
@@ -409,7 +414,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/compete/period`)"
     />
     รายชื่อผู้สมัครสอบแข่งขัน {{ name }} ครั้งที่ {{ round }}/{{ year }}
     <q-space />

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

@@ -149,7 +149,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/compete/import/${importId}`)"
     />
     รายละเอียดของผู้สมัครสอบ {{ examID }} : {{ prefix }}{{ fullname }}
   </div>

src/modules/03_recruiting/views/02_qualify/DisableDetail.vue

@@ -352,7 +352,6 @@ async function onSubmitCandidates(date: Date) {
         .then(() => {
           success($q, "นำผู้ผ่านคัดเลือกคนพิการเข้าสู่ระบบบรรจุ");
           modalCandidates.value = false;
-          // router.go(-1);
         })
         .catch((e) => {
           messageError($q, e);
@@ -396,7 +395,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/compete/period`)"
     />
     รายชื่อผู้สมัครสอบรอบ {{ name }} ครั้งที่ {{ round }}/{{ year }}
     <q-space />

src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue

@@ -149,7 +149,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/disable/import/${importId}`)"
     />
     รายละเอียดของผู้สมัครสอบ {{ examID }} : {{ prefix }}{{ fullname }}
   </div>

src/modules/03_recruiting/views/02_qualify/ExamForm.vue

@@ -71,14 +71,15 @@ async function confirm(status: boolean, reason: string) {
       status: status,
       reason: reason,
     })
-    .then((res) => {})
+    .then(() => {
+      success($q, "ตรวจสอบข้อมูลสำเร็จ");
+      router.push(`/qualify/manage/${examId.value}`);
+    })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
+    .finally(() => {
       hideLoader();
-      success($q, "ตรวจสอบข้อมูลสำเร็จ");
-      router.push(`/qualify/manage/${examId.value}`);
     });
 }
 
@@ -89,14 +90,15 @@ async function reject(reason: string) {
     .put(config.API.candidateRejectRegister(candidateId.value), {
       reason: reason,
     })
-    .then((res) => {})
+    .then(() => {
+      success($q, "ตรวจสอบข้อมูลสำเร็จ");
+      router.push(`/qualify/manage/${examId.value}`);
+    })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
+    .finally(() => {
       hideLoader();
-      success($q, "ตรวจสอบข้อมูลสำเร็จ");
-      router.push(`/qualify/manage/${examId.value}`);
     });
 }
 
@@ -123,14 +125,15 @@ async function rejectReverse(reason: string) {
     .put(config.API.candidateCheckRegisterReject(candidateId.value), {
       reason: reason,
     })
-    .then((res) => {})
+    .then(() => {
+      success($q, "สำเร็จ");
+      router.push(`/qualify/manage/${examId.value}`);
+    })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
+    .finally(() => {
       hideLoader();
-      success($q, "สำเร็จ");
-      router.push(`/qualify/manage/${examId.value}`);
     });
 }
 
@@ -289,7 +292,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/qualify/manage/${examId}`)"
     />
     ตรวจสอบคุณสมบัติผู้สมัครสอบรอบคัดเลือก
     {{

src/modules/03_recruiting/views/02_qualify/Payment.vue

@@ -73,14 +73,15 @@ async function confirm(status: boolean, reason: string) {
       status: status,
       reason: reason,
     })
-    .then((res) => {})
+    .then(() => {
+      success($q, "ตรวจสอบข้อมูลชำระเงินสำเร็จ");
+      router.push(`/qualify/manage/${examId.value}`);
+    })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
+    .finally(() => {
       hideLoader();
-      success($q, "ตรวจสอบข้อมูลชำระเงินสำเร็จ");
-      router.push(`/qualify/manage/${examId.value}`);
     });
 }
 
@@ -120,7 +121,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/qualify/manage/${examId}`)"
     />
     ตรวจสอบการชำระเงิน
   </div>

src/modules/03_recruiting/views/02_qualify/manageDetail.vue

@@ -404,7 +404,7 @@ onMounted(async () => {
       flat
       color="primary"
       class="q-mr-sm"
-      @click="router.go(-1)"
+      @click="router.push(`/qualify/manage`)"
     />
     {{
       `${name} ${round == null ? "" : "ครั้งที่ " + round + "/"}${