From 543ae775bd448dab3de77e5bb662fc64d960991d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 24 Apr 2025 15:06:32 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Eva?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Detail/step/step2.vue          | 59 +++++++----------
 .../components/Detail/step/step5.vue          | 33 ++++------
 .../components/Detail/step/step6.vue          | 64 +++++++------------
 3 files changed, 59 insertions(+), 97 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
index 122218c2e..8c82e9109 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
@@ -136,7 +136,6 @@ onMounted(async () => {
                       outlined
                       v-model="formCommand.elementaryFullName"
                       label="ชื่อ-นามสกุล"
-                      lazy-rules
                       hide-bottom-space
                     />
 
@@ -144,42 +143,38 @@ onMounted(async () => {
                       <div class="row col-12 q-col-gutter-sm">
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.elementaryPosition"
                           label="ตำแหน่ง"
-                          lazy-rules
                           hide-bottom-space
                         />
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
-                          dense
-                          outlined
-                          v-model="formCommand.elementaryPositionOld"
-                          label="ตำแหน่งเดิม"
-                          lazy-rules
-                          hide-bottom-space
-                        />
-                        <q-input
-                          readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.elementaryOrg"
                           label="สังกัด"
-                          lazy-rules
                           hide-bottom-space
                         />
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
+                          dense
+                          outlined
+                          v-model="formCommand.elementaryPositionOld"
+                          label="ตำแหน่งเดิม"
+                          hide-bottom-space
+                        />
+                        <q-input
+                          readonly
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.elementaryOrgOld"
                           label="สังกัดเดิม"
-                          lazy-rules
                           hide-bottom-space
                         />
                       </div>
@@ -202,50 +197,44 @@ onMounted(async () => {
                       outlined
                       v-model="formCommand.abovelevelFullname"
                       label="ชื่อ-นามสกุล"
-                      :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อ-นามสกุล'}`]"
-                      lazy-rules
                       hide-bottom-space
                     />
                     <div class="col-12">
                       <div class="row col-12 q-col-gutter-sm">
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.abovelevelPosition"
                           label="ตำแหน่ง"
-                          lazy-rules
                           hide-bottom-space
                         />
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
-                          dense
-                          outlined
-                          v-model="formCommand.abovelevelPositionOld"
-                          label="ตำแหน่งเดิม"
-                          lazy-rules
-                          hide-bottom-space
-                        />
-                        <q-input
-                          readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.abovelevelOrg"
                           label="สังกัด"
-                          lazy-rules
                           hide-bottom-space
                         />
                         <q-input
                           readonly
-                          class="col-xs-6 col-sm-3"
+                          class="col-xs-6 col-sm-6"
+                          dense
+                          outlined
+                          v-model="formCommand.abovelevelPositionOld"
+                          label="ตำแหน่งเดิม"
+                          hide-bottom-space
+                        />
+                        <q-input
+                          readonly
+                          class="col-xs-6 col-sm-6"
                           dense
                           outlined
                           v-model="formCommand.abovelevelOrgOld"
                           label="สังกัดเดิม"
-                          lazy-rules
                           hide-bottom-space
                         />
                       </div>
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
index f2ea25601..5c01eaa20 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
@@ -72,17 +72,17 @@ async function save() {
   ) {
     dialogConfirm($q, async () => {
       showLoader();
-      http
+      await http
         .put(config.API.evaluationNext5To6(id.value))
         .then(() => {
           success($q, "บันทึกแจ้งผลการประกาศคัดเลือกสำเร็จ");
+          store.step = 6;
+          store.currentStep = 6;
         })
         .catch((e) => {
           messageError($q, e);
         })
         .finally(() => {
-          store.step = 6;
-          store.currentStep = 6;
           hideLoader();
         });
     });
@@ -164,7 +164,6 @@ async function copyLink(name: string) {
 
 /** function เรียกข้อมูลวันที่ประกาศ */
 async function getDate() {
-  showLoader();
   await http
     .get(config.API.evaluationDateAnnounce(id.value))
     .then((res) => {
@@ -174,11 +173,6 @@ async function getDate() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1500);
     });
 }
 
@@ -186,7 +180,6 @@ const download10Url = ref<string>("");
 
 /** function เช็คไฟล์อัปโหลด*/
 async function checkDocResult() {
-  showLoader();
   await http
     .get(
       config.API.evaluationPatchData(
@@ -197,11 +190,6 @@ async function checkDocResult() {
     )
     .then((res: any) => {
       download10Url.value = res.data.downloadUrl;
-    })
-    .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1500);
     });
 }
 
@@ -209,7 +197,6 @@ async function checkDocResult() {
  * function เรียกข้อมูลผลงาน
  */
 async function fetchDataSigner() {
-  showLoader();
   await http
     .get(config.API.evaluationSigner(id.value, 1))
     .then((res) => {
@@ -221,16 +208,18 @@ async function fetchDataSigner() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1500);
     });
 }
 
 onMounted(async () => {
-  await Promise.all([getDate(), checkDocResult(), fetchDataSigner()]);
+  try {
+    showLoader();
+    await Promise.all([getDate(), checkDocResult(), fetchDataSigner()]);
+  } catch (error) {
+    console.log(error);
+  } finally {
+    hideLoader();
+  }
 });
 </script>
 
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
index 29227328f..4af879af6 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
@@ -179,52 +179,44 @@ onMounted(async () => {
                     outlined
                     label="ชื่อ-นามสกุล"
                     v-model="formCommand.elementaryFullName"
-                    lazy-rules
                     hide-bottom-space
                   />
                   <div class="col-12">
                     <div class="row col-12 q-col-gutter-sm">
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.elementaryPosition"
                         label="ตำแหน่ง"
-                        lazy-rules
                         hide-bottom-space
                       />
-
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
-                        dense
-                        outlined
-                        v-model="formCommand.elementaryPositionOld"
-                        label="ตำแหน่งเดิม"
-                        :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งเดิม'}`]"
-                        lazy-rules
-                        hide-bottom-space
-                      />
-
-                      <q-input
-                        readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.elementaryOrg"
                         label="สังกัด"
-                        lazy-rules
                         hide-bottom-space
                       />
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
+                        dense
+                        outlined
+                        v-model="formCommand.elementaryPositionOld"
+                        label="ตำแหน่งเดิม"
+                        hide-bottom-space
+                      />
+                      <q-input
+                        readonly
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.elementaryOrgOld"
                         label="สังกัดเดิม"
-                        lazy-rules
                         hide-bottom-space
                       />
                     </div>
@@ -247,8 +239,6 @@ onMounted(async () => {
                     outlined
                     v-model="formCommand.abovelevelFullname"
                     label="ชื่อ-นามสกุล"
-                    :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อ-นามสกุล'}`]"
-                    lazy-rules
                     hide-bottom-space
                   />
 
@@ -256,45 +246,39 @@ onMounted(async () => {
                     <div class="row col-12 q-col-gutter-sm">
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.abovelevelPosition"
                         label="ตำแหน่ง"
-                        lazy-rules
                         hide-bottom-space
                       />
 
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
-                        dense
-                        outlined
-                        v-model="formCommand.abovelevelPositionOld"
-                        label="ตำแหน่งเดิม"
-                        :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งเดิม'}`]"
-                        lazy-rules
-                        hide-bottom-space
-                      />
-
-                      <q-input
-                        readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.abovelevelOrg"
                         label="สังกัด"
-                        lazy-rules
                         hide-bottom-space
                       />
                       <q-input
                         readonly
-                        class="col-xs-6 col-sm-3"
+                        class="col-xs-6 col-sm-6"
+                        dense
+                        outlined
+                        v-model="formCommand.abovelevelPositionOld"
+                        label="ตำแหน่งเดิม"
+                        hide-bottom-space
+                      />
+                      <q-input
+                        readonly
+                        class="col-xs-6 col-sm-6"
                         dense
                         outlined
                         v-model="formCommand.abovelevelOrgOld"
                         label="สังกัดเดิม"
-                        lazy-rules
                         hide-bottom-space
                       />
                     </div>