From 4bcd247df8657a7fbfa955bf1c7aa718f629986c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 11 Oct 2023 11:30:45 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=81=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=81=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=AA=E0=B8=B2=E0=B8=A1=E0=B8=B1=E0=B8=8D?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A1=E0=B8=B5=E0=B8=AA=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=A2=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=9E=E0=B8=A3=E0=B8=B0=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=AD=E0=B8=B4=E0=B8=AA=E0=B8=A3=E0=B8=B4=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A0=E0=B8=A3=E0=B8=93=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_Manage/listManage.vue        | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index f37b1c58b..361ef0c4b 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -165,30 +165,32 @@ const fecthInsigniaByOc = async (
   role: string,
   status: string
 ) => {
-  showLoader();
-  await http
-    .get(config.API.insigniaList(roundId, ocId, role, status))
-    .then(async (res) => {
-      requestNote.value = res.data.result.requestNote;
-      requestStatus.value = res.data.result.requestStatus;
-      requestId.value = res.data.result.requestId;
-      document.value = res.data.result.document;
-      await DataStore.fetchData(res.data.result.items); // ส่งรายชื่อข้าราชการสามัญฯ
-      await DataStore.fetchDataInsignia(res.data.result); // ส่งข้อมูลรอบบการแสดง
-      loading.value = true;
-      // แสดงปุมล็อกข้อมูล
-      if (res.data.result.items !== null) {
-        if (res.data.result.items.length !== 0) {
-          hideBottom.value = true;
-        } else hideBottom.value = false;
-      }
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
+  if (roundId && ocId && role && status) {
+    showLoader();
+    await http
+      .get(config.API.insigniaList(roundId, ocId, role, status))
+      .then(async (res) => {
+        requestNote.value = res.data.result.requestNote;
+        requestStatus.value = res.data.result.requestStatus;
+        requestId.value = res.data.result.requestId;
+        document.value = res.data.result.document;
+        await DataStore.fetchData(res.data.result.items); // ส่งรายชื่อข้าราชการสามัญฯ
+        await DataStore.fetchDataInsignia(res.data.result); // ส่งข้อมูลรอบบการแสดง
+        loading.value = true;
+        // แสดงปุมล็อกข้อมูล
+        if (res.data.result.items !== null) {
+          if (res.data.result.items.length !== 0) {
+            hideBottom.value = true;
+          } else hideBottom.value = false;
+        }
+      })
+      .catch((err) => {
+        messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  }
 };
 
 // ส่งรอบการเสนอขอต่อ เฉพาะ รอบที่ requestStatus st1 และ st4
@@ -449,7 +451,10 @@ const uploadFile = async (event: any) => {
 
   <q-card flat bordered class="col-12 q-mt-sm" v-if="loading">
     <div
-      v-if="(roleDataStore.insignia1Role && requestStatus == 'st4') || (roleDataStore.insignia2Role && requestStatus == 'st5')"
+      v-if="
+        (roleDataStore.insignia1Role && requestStatus == 'st4') ||
+        (roleDataStore.insignia2Role && requestStatus == 'st5')
+      "
       class="q-pa-md q-gutter-sm"
     >
       <q-banner
@@ -581,7 +586,10 @@ const uploadFile = async (event: any) => {
         @click="sendToDirector"
       />
       <q-btn
-        v-if="roleDataStore.insignia2Role && (requestStatus == 'st3' || requestStatus == 'st5')"
+        v-if="
+          roleDataStore.insignia2Role &&
+          (requestStatus == 'st3' || requestStatus == 'st5')
+        "
         dense
         unelevated
         label="ตีกลับ"
@@ -599,7 +607,9 @@ const uploadFile = async (event: any) => {
         @click="directorApproved"
       />
       <q-btn
-        v-if="requestStatus == 'st6' && roleDataStore.adminRole && !DataStore.isLock"
+        v-if="
+          requestStatus == 'st6' && roleDataStore.adminRole && !DataStore.isLock
+        "
         dense
         unelevated
         label="ตีกลับ"