diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts
index c436efde8..0fd9ea551 100644
--- a/src/api/07_insignia/api.insignia.ts
+++ b/src/api/07_insignia/api.insignia.ts
@@ -81,7 +81,8 @@ export default {
     `${insignia}/manage/borrow/${year}/${insigniaTypeId}`,
   insigniaManageBorrowById: (insigniaManageProfileId: string) =>
     `${insignia}/manage/borrow/${insigniaManageProfileId}`,
-
+    requestinsignia: (type: string,id:string) =>
+    `${insignia}/request/note/${type}/${id}`,
   // InsigniaReport API รายงานระบบเครื่องราชอิสริยาภรณ์
   // ******
   // type = 39 : 39-แบบ ขร1 บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ ข้าราชการ ชั้นสายสะพาย
@@ -96,4 +97,5 @@ export default {
   //   fileType = pdf, docx หรือ xlsx
   reportInsignia: (type: string, fileType: string, fileId: string) =>
     `${report}/insignia/${type}/${fileType}/${fileId}`,
+
 };
diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index bbadf7862..4351df2d2 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { onMounted, ref } from "vue";
 import { QForm, useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 
@@ -9,20 +9,23 @@ import config from "@/app.config";
 import type { DataOption } from "@/modules/04_registry/components/profileType";
 
 const $q = useQuasar();
-const myForm = ref<QForm>();
+const myForm = ref<any>();
 const mixin = useCounterMixin();
-const { date2Thai } = mixin;
+const { date2Thai,showLoader,success,hideLoader,messageError,dialogConfirm } = mixin;
 const files = ref<any>();
 const filesReturn = ref<any>();
 const OrganazationId = ref<string>("");
 const OrgList = ref<DataOption[]>([]);
-const Datereceive = ref<Date | null>();
+const Datereceive = ref<Date | null>(null);
 const Datereturn = ref<Date | null>();
 const remark = ref<string>("")
-
+const nullii = ref<any>(null)
 const props = defineProps({
   modal: Boolean,
+  personId: String,
   close: Function,
+  fecthlistInsignia: Function,
+  fileCheck:String
 });
 // reset วันที่ประกาศราชกิจจานุเบกษา
 const clearReceiveDate = () => {
@@ -33,27 +36,103 @@ const clearReturnDate = () => {
 };
 const close = () => {
   props.close?.();
-  Datereceive.value = null;
-  Datereturn.value = null;
+      Datereceive.value = null
+      files.value = null
+      OrganazationId.value = ''
+      Datereturn.value = null
+      filesReturn.value = null
+      OrganazationId.value = ''
 };
+
+const SaveData = async (type:string,id:string) => {
+ await myForm.value.validate().then((result: boolean) => {
+  console.log(result)
+    if (result) {
+      console.log(1)
+      dialogConfirm($q,() => dataSave(type,id))
+}else{
+  console.log(2)
+}
+
+})};
+const dataSave = (type:string,id:string) => {
+  const formData = new FormData();
+    if(props.fileCheck === null){
+        formData.append("Datereceiveinsignia", Datereceive.value);
+        formData.append("Docreceiveinsignia", files.value);
+        formData.append("Orgreceiveinsignia", nullii.value);
+    } else {
+        formData.append("DateReturnInsignia", Datereturn.value);
+        formData.append("DocReturnInsignia", filesReturn.value);
+        formData.append("OrgReturnInsignia", nullii.value);
+    }
+  showLoader();
+   http
+    .put(config.API.requestinsignia(type,id), formData)
+    .then(() => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      Datereceive.value = null
+      files.value = null
+      OrganazationId.value = ''
+      Datereturn.value = null
+      filesReturn.value = null
+      OrganazationId.value = ''
+      props.close?.();
+      hideLoader();
+      props.fecthlistInsignia?.()
+    });
+}
+const fetchOrgList = async () => {
+  showLoader();
+  await http
+    .get(config.API.typeOc())
+    .then(async (response: any) => {
+      const orgArr = response.data.result.map((e: any) => ({
+        id: e.organizationId,
+        name: e.organizationName,
+      }));
+      // if (props.action == "editData") {
+      //   OrgList.value = [
+      //     {
+      //       id: "00000000-0000-0000-0000-000000000000",
+      //       name: "สำนักนายกรัฐมนตรี",
+      //     },
+      //     ...orgArr,
+      //   ];
+      // } else {
+      OrgList.value = orgArr;
+      // }
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
+onMounted(()=>{
+  fetchOrgList()
+})
 </script>
 
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 900px">
       <q-toolbar>
-        <q-toolbar-title class="text-subtitle2 text-bold">รับ-คืนเครื่องราชฯ</q-toolbar-title>
+        <q-toolbar-title v-if="props.fileCheck === null" class="text-subtitle2 text-bold">รับเครื่องราชฯ</q-toolbar-title>
+        <q-toolbar-title v-else class="text-subtitle2 text-bold">คืนเครื่องราชฯ</q-toolbar-title>
         <q-btn icon="close" unelevated round dense @click="close" style="color: #ff8080; background-color: #ffdede" />
       </q-toolbar>
       <q-separator />
 
       <q-form ref="myForm">
         <div class="q-pa-md bg-grey-1">
-          <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
-            <div class="col-12 text-weight-bold text-grey-7">
-              รับเครื่องราชฯ
-            </div>
-            <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
+          <div v-if="props.fileCheck === null" class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
               <div class="col-xs-12 col-sm-4">
                 <datepicker menu-class-name="modalfix" v-model="Datereceive" :locale="'th'" autoApply borderless
                   :enableTimePicker="false" week-start="0">
@@ -77,7 +156,8 @@ const close = () => {
               </div>
 
               <div class="col-xs-12 col-sm-4">
-                <q-file ref="myForm" outlined dense v-model="files" label="ไฟล์หลักฐานการรับ" lazy-rules
+
+                <q-file outlined dense v-model="files" label="ไฟล์หลักฐานการรับ" lazy-rules
                   :rules="[(val) => val || 'กรุณาเลือกไฟล์หลักฐานการรับ']" hide-bottom-space>
                   <template v-slot:prepend>
                     <q-icon name="attach_file" color="primary" />
@@ -85,14 +165,14 @@ const close = () => {
                 </q-file>
               </div>
               <div class="col-xs-12 col-sm-4">
-                <q-select hide-bottom-space :options="OrgList" dense borderless option-label="name" option-value="id"
+                <q-select  hide-bottom-space :options="OrgList" dense borderless option-label="name" option-value="id"
                   emit-value map-options outlined v-model="OrganazationId" lazy-rules :label="`หน่วยงานที่รับ`"
                   :rules="[(val) => !!val || 'กรุณาเลือกหน่วยงานที่รับ']" />
               </div>
-              <div class="col-12 q-mt-md text-weight-bold text-grey-7">
-                คืนเครื่องราชฯ
-              </div>
+            </div>
+            <div v-if="props.fileCheck !== null" class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
               <div class="col-xs-12 col-sm-4">
+                
                 <datepicker menu-class-name="modalfix" v-model="Datereturn" :locale="'th'" autoApply borderless
                   :enableTimePicker="false" week-start="0">
                   <template #year="{ year }">
@@ -104,7 +184,7 @@ const close = () => {
                   <template #trigger>
                     <q-input dense borderless outlined lazy-rules :rules="[(val) => !!val || 'กรุณาเลือกวันที่คืน']"
                       hide-bottom-space :model-value="Datereturn != null ? date2Thai(Datereturn) : undefined
-                        " :label="`${'วันที่ได้รับ'}`" clearable @clear="clearReturnDate">
+                        " :label="`${'วันที่คืน'}`" clearable @clear="clearReturnDate">
                       <template v-slot:prepend>
                         <q-icon name="event" class="cursor-pointer" color="primary">
                         </q-icon>
@@ -114,7 +194,7 @@ const close = () => {
                 </datepicker>
               </div>
               <div class="col-xs-12 col-sm-4">
-                <q-file ref="myForm" outlined dense v-model="filesReturn" label="ไฟล์หลักฐานการคืน" lazy-rules
+                <q-file outlined dense v-model="filesReturn" label="ไฟล์หลักฐานการคืน" lazy-rules
                   :rules="[(val) => val || 'กรุณาเลือกไฟล์หลักฐานการคืน']" hide-bottom-space>
                   <template v-slot:prepend>
                     <q-icon name="attach_file" color="primary" />
@@ -127,19 +207,19 @@ const close = () => {
                   :rules="[(val) => !!val || 'กรุณาเลือกหน่วยงานที่คืน']" />
               </div>
 
-              <div class="col-xs-12 col-sm-12">
+              <!-- <div class="col-xs-12 col-sm-12">
                 <q-input type="textarea" v-model="remark" outlined dense rows="3" :label="`${'หมายเหตุ'}`"/>
-              </div>
+              </div> -->
 
             </div>
           </div>
-        </div>
+
       </q-form>
 
       <q-separator />
       <div class="q-px-md q-py-sm">
         <div class="row justify-end">
-          <q-btn label="บันทึก" color="public">
+          <q-btn label="บันทึก" color="public" @click="SaveData(props.fileCheck === null ? 'receive':'return',props.personId as string)">
             <q-tooltip>บันทึก</q-tooltip>
           </q-btn>
         </div>
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index 5113d8288..c4d8a1c7a 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -58,6 +58,12 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       datepay: date2Thai(e.datePayment),
       typepay: e.typePayment,
       address: e.address,
+      dateReceiveInsignia:e.dateReceiveInsignia,
+      dateReturnInsignia:e.dateReturnInsignia,
+      docReceiveInsignia:e.docReceiveInsignia,
+      docReturnInsignia:e.docReturnInsignia,
+      orgReceiveInsignia:e.orgReceiveInsignia,
+      orgReturnInsignia:e.orgReturnInsignia,
     }));
     rows.value = alllist
     listInsignia.value = alllist
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 936489a82..c8a477cc5 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -37,6 +37,8 @@ const fileinvoice = ref<any>(null);
 const loadView = ref<boolean>(false);
 const insigniaTypeOption = ref<any>([]);
 const ModalDialog = ref<boolean>(false);
+const dateReceiveInsignia = ref<Date>()
+const fileCheck = ref<any>()
 onMounted(async () => {
   await fecthRound();
 });
@@ -426,8 +428,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
-const OpenModal = () => {
+const OpenModal = (data:any) => {
   ModalDialog.value = true;
+  fileCheck.value = data.docReceiveInsignia
+  personId.value = data.id
 };
 </script>
 
@@ -721,7 +725,9 @@ const OpenModal = () => {
                           </q-item-section>
                           <q-item-section>เเก้ไขข้อมูล</q-item-section>
                         </q-item>
-                        <q-item clickable v-close-popup @click="OpenModal()">
+                        <q-item 
+                        :disable="props.row.docReceiveInsignia !== null && props.row.docReturnInsignia !== null"
+                        clickable v-close-popup @click="OpenModal(props.row)">
                           <q-item-section
                             style="min-width: 0px"
                             avatar
@@ -754,7 +760,13 @@ const OpenModal = () => {
       </q-tab-panel>
     </q-tab-panels>
 
-    <Dialogbody :modal="ModalDialog" :close="close" />
+    <Dialogbody 
+    :modal="ModalDialog" 
+    :close="close" 
+    :fileCheck="fileCheck"
+    :personId="personId"
+    :fecthlistInsignia="fecthlistInsignia"/>
+
     <DialogForm
       :modal="modal"
       :save="save"