เครื่องราช

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>

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
         );