From 04a345e6f51ff3b9759fe61796a8d2086ca74dff Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 6 Sep 2023 14:03:54 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Discharged/dischargedRegistry.vue          | 2 +-
 .../06_retirement/components/DismissOrder/outRegistry.vue | 2 +-
 .../components/ExitInterview/exitRegistry.vue             | 5 +++--
 .../07_insignia/components/1_Proposals/listProposals.vue  | 2 +-
 .../07_insignia/components/2_Manage/listManage.vue        | 8 +++++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
index 027cf8179..f17055842 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
@@ -409,7 +409,7 @@ const getData = async () => {
       responseData.value.reason = data.reason ?? "";
       responseData.value.salary = data.salary !== null ? data.salary : 0;
       responseData.value.status = data.status ?? "";
-      responseData.value.avataPath = data.avataPath ?? "";
+      responseData.value.avataPath = data.avatar ?? "";
       responseData.value.fullname = `${data.firstName ?? "-"} ${
         data.lastName ?? "-"
       }`;
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index a65125800..12fd2a5a0 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -415,7 +415,7 @@ const getData = async () => {
       responseData.value.reason = data.reason ?? "";
       responseData.value.salary = data.salary !== null ? data.salary : 0;
       responseData.value.status = data.status ?? "";
-      responseData.value.avataPath = data.avataPath ?? "";
+      responseData.value.avataPath = data.avatar ?? "";
       responseData.value.fullname = `${data.firstName ?? "-"} ${
         data.lastName ?? "-"
       }`;
diff --git a/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue b/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
index 8a850b125..0f71df9fe 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
@@ -42,14 +42,14 @@
             </div>
           </div>
         </div>
-        <!-- <div class="col-xs-6 col-sm-3 row items-center">
+        <div class="col-xs-6 col-sm-3 row items-center">
           <div class="col-12">
             <div class="col-12 text-top">สังกัด</div>
             <div class="col-12 text-detail">
               {{ Org }}
             </div>
           </div>
-        </div> -->
+        </div>
       </div>
     </div>
   </q-card>
@@ -526,6 +526,7 @@ const getData = async () => {
       Position.value = data.position ?? "";
       PositionLevel.value = data.positionLevel ?? "";
       Org.value = data.org ?? "";
+    
       fullname.value = data.fullname ?? "";
       prefix.value = data.prefix ?? "";
       reasonWork.value = data.reasonWork ?? [];
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index 7a47d7195..c4df1b6c0 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -359,7 +359,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   flat
                   round
                   color="primary"
-                  @click="clickListInsignia(props.row.id)"
+                  @click="clickListInsignia(props.row.period_id)"
                   icon="mdi-account-check"
                 >
                   <q-tooltip>ผู้ได้รับเครื่องราชฯ</q-tooltip>
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 25728e56b..9f8d22610 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -169,13 +169,12 @@ const fecthInsigniaByOc = async (
       if (res.data.result.items !== null) {
         if (res.data.result.items.length !== 0) {
           hideBottom.value = true;
-        }
+        } else hideBottom.value = false;
       }
 
       // if (res.data.result.items.length !== 0) {
       //   hideBottom.value = true;
       // }
-
       // DataStore.isLock = await res.data.result.isLock;
       // DataStore.requestId = await res.data.result.requestId;
     })
@@ -281,6 +280,9 @@ const directorApproved = async () => {
 };
 
 const requestSendNote = async () => {
+  var organization = await (DataStore.agency != null
+    ? DataStore.agency
+    : DataStore.typeOc);
   dialogConfirm($q, async () => {
     showLoader();
     await http
@@ -291,7 +293,7 @@ const requestSendNote = async () => {
         success($q, "บันทึกสำเร็จ");
         await fecthInsigniaByOc(
           round.value,
-          DataStore.agency,
+          organization,
           "officer",
           tab.value
         );