Merge pull request #1507 from Frappet/fix/bug

fix:bug  router(-1)

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 + "/"}${