updated

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() {
+  dialogConfirm(
+    $q,
+    () => {
       showLoader();
       http
         .put(config.API.evaluationApproveDoc1(id.value))
         .then((res) => {})
         .catch((e) => {})
         .finally(() => {
-      success($q, "ส่งไปประกาศบนเว็บไซต์ สำเร็จ");
+          success($q, "ส่งไปประกาศบนเว็บไซต์สำเร็จ");
           getStep();
         });
+    },
+    "ยืนยันการส่งไปประกาศบนเว็บไซต์",
+    "ยืนยันการส่งไปประกาศบนเว็บไซต์ใช่หรือไม่?"
+  );
 }
 
 function getStep() {

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,6 +80,7 @@ function deleteFile(name: string) {
 }
 
 function save() {
+  dialogConfirm($q, () => {
     showLoader();
     http
       .put(config.API.evaluationNext5To6(id.value))
@@ -86,6 +94,7 @@ function save() {
         store.currentStep = 6;
         hideLoader();
       });
+  });
 }
 
 function upLoadFile() {

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"