From 14ccbcfe62d1915e1ff85436496f3eddce3bb640 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Sat, 23 Dec 2023 18:51:23 +0700
Subject: [PATCH] updated

---
 .../components/Detail/step/step4.vue          | 26 ++++++++-----
 .../components/Detail/step/step5.vue          | 37 ++++++++++++-------
 .../components/Detail/viewstep/viewStep1.vue  |  2 +-
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue
index 7e1855c4f..4bde68153 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue
@@ -124,7 +124,6 @@ function getPDF(url: string, type: string, fileName: string) {
       },
     })
     .then(async (res) => {
-      console.log(res);
       const a = document.createElement("a");
       a.href = window.URL.createObjectURL(res.data);
       a.download = fileName;
@@ -137,15 +136,22 @@ function getPDF(url: string, type: string, fileName: string) {
 
 /** ส่งไปประกาศบนเว็บไซต์ */
 function onWebSite() {
-  showLoader();
-  http
-    .put(config.API.evaluationApproveDoc1(id.value))
-    .then((res) => {})
-    .catch((e) => {})
-    .finally(() => {
-      success($q, "ส่งไปประกาศบนเว็บไซต์ สำเร็จ");
-      getStep();
-    });
+  dialogConfirm(
+    $q,
+    () => {
+      showLoader();
+      http
+        .put(config.API.evaluationApproveDoc1(id.value))
+        .then((res) => {})
+        .catch((e) => {})
+        .finally(() => {
+          success($q, "ส่งไปประกาศบนเว็บไซต์สำเร็จ");
+          getStep();
+        });
+    },
+    "ยืนยันการส่งไปประกาศบนเว็บไซต์",
+    "ยืนยันการส่งไปประกาศบนเว็บไซต์ใช่หรือไม่?"
+  );
 }
 
 function getStep() {
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
index f6188deff..9bd7c0a4d 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
@@ -24,7 +24,14 @@ const numOfPages = ref<number>(0);
 const page = ref<number>(1);
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { date2Thai, showLoader, hideLoader, messageError, success } = mixin;
+const {
+  dialogConfirm,
+  date2Thai,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+} = mixin;
 const AnnouncementStartDate = ref<string | null>();
 const AnnouncementEndDate = ref<string | null>();
 const id = ref<string>(route.params.id as string);
@@ -73,19 +80,21 @@ function deleteFile(name: string) {
 }
 
 function save() {
-  showLoader();
-  http
-    .put(config.API.evaluationNext5To6(id.value))
-    // .then((res) => {})
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      success($q, "บันทึกแจ้งผลการประกาศคัดเลือกสำเร็จ");
-      store.step = 6;
-      store.currentStep = 6;
-      hideLoader();
-    });
+  dialogConfirm($q, () => {
+    showLoader();
+    http
+      .put(config.API.evaluationNext5To6(id.value))
+      // .then((res) => {})
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        success($q, "บันทึกแจ้งผลการประกาศคัดเลือกสำเร็จ");
+        store.step = 6;
+        store.currentStep = 6;
+        hideLoader();
+      });
+  });
 }
 
 function upLoadFile() {
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
index 1e75588c6..803806f49 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -227,7 +227,7 @@ onMounted(() => {
             <span class="q-ml-lg q-my-sm">ประวัติการศึกษา </span>
           </div>
           <q-separator />
-          <div v-if="formDetail.educations.length > 0">
+          <div v-if="formDetail.educations && formDetail.educations.length > 0">
             <div
               class="row q-pa-sm"
               v-for="(education, index) in formDetail.educations"