From 20a3c3ef9bce1a658f2d4c2a9f5476f5be73d2ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 21 Sep 2023 12:07:12 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../07_insignia/components/2_Manage/Tab1.vue  | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 7e9775fbf..6e3c4f072 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -255,9 +255,11 @@ const changtypeOc = () => {
 };
 // เพิ่มราชชื่อ
 const clickmodalAdd = () => {
+  let ocId = DataStore.typeOc ? DataStore.typeOc : DataStore.agency;
   showLoader();
   fecthInsignia();
-  fecthlistperson(DataStore.typeOc);
+  fecthlistperson(ocId);
+
   insigniaType.value = "";
 };
 // เรียกรายชื่อข้าราชการตามหน่วยงานที่จะเพิ่ม
@@ -421,15 +423,12 @@ const closemodelPopupReject = () => {
 };
 // ยืนยัน การไม่ยืนขอ
 const savaReasonReject = (reason: string) => {
-  dialogConfirm(
-    $q,
-    async () => {
-      await listreject(rowid.value, reason);
-      if (props.fecthStat) {
-        await props.fecthStat(DataStore.roundId);
-      }
-    },
-  );
+  dialogConfirm($q, async () => {
+    await listreject(rowid.value, reason);
+    if (props.fecthStat) {
+      await props.fecthStat(DataStore.roundId);
+    }
+  });
 };
 // ยืนยัน การไม่ยืนขอ API
 const listreject = async (profileId: string, reason: string) => {
@@ -788,10 +787,7 @@ const closeModalEdit = () => {
                 >
                   <q-menu transition-show="jump-down" transition-hide="jump-up">
                     <q-list dense style="min-width: 250px">
-                      <q-item
-                        clickable
-                        @click.stop="clickmodalEdit(props.row)"
-                      >
+                      <q-item clickable @click.stop="clickmodalEdit(props.row)">
                         <q-item-section
                           style="min-width: 0px"
                           avatar
@@ -804,10 +800,7 @@ const closeModalEdit = () => {
                           >แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
                         >
                       </q-item>
-                      <q-item
-                        clickable
-                        @click.stop="clickReject(props.row.id)"
-                      >
+                      <q-item clickable @click.stop="clickReject(props.row.id)">
                         <q-item-section
                           style="min-width: 0px"
                           avatar
@@ -822,10 +815,7 @@ const closeModalEdit = () => {
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item
-                        clickable
-                        @click.stop="clickDelete(props.row.id)"
-                      >
+                      <q-item clickable @click.stop="clickDelete(props.row.id)">
                         <q-item-section
                           style="min-width: 0px"
                           avatar