diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index 724cdc51d..1c8dae5ab 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -81,11 +81,11 @@ function onSubmit(type: string, id: string) {
     if (props.dateCheckReceive === null) {
       formData.append("Date", dateToISO((Datereceive.value as Date) ?? nullii));
       formData.append("File", files.value);
-      formData.append("OrgId", OrganazationId.value);
+      // formData.append("OrgId", OrganazationId.value);
     } else {
       formData.append("Date", dateToISO((Datereturn.value as Date) ?? nullii));
       formData.append("File", filesReturn.value);
-      formData.append("OrgId", OrganazationId2.value);
+      // formData.append("OrgId", OrganazationId2.value);
     }
     showLoader();
     http
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index c3b5e8f16..2a84c1873 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -287,7 +287,7 @@ watch(props, () => {
   if (props.modal == true && props.roundId != "all") {
     roundNo.value = props.roundId;
     if (props.action === "editData") {
-      fetchOrgList();
+      // fetchOrgList();
     } else {
       fecthlistInsignia();
     }
@@ -489,7 +489,7 @@ watch(props, () => {
                 </datepicker>
               </div>
 
-              <div class="col-xs-12 col-sm-6">
+              <!-- <div class="col-xs-12 col-sm-6">
                 <q-select
                   hide-bottom-space
                   :options="filterOrgList"
@@ -509,7 +509,7 @@ watch(props, () => {
                     doneFn:Function) => filterSelector(inputValue, doneFn,'filterOrgList'
                     ) "
                 />
-              </div>
+              </div> -->
 
               <div class="col-12">
                 <q-input
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index a2a3c8806..a6789477f 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -79,13 +79,15 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       position: e.position,
       status: status(e.status),
       dateReceive: date2Thai(e.dateReceive),
-      name: e.prefix + e.fullName,
+      name: e.fullName,
       type: `${e.requestInsignia} (${
         type.value.find((item) => item.name === e.requestInsignia)?.shortName ||
         ""
       })`,
-      employeeType: profileType(e.profileType),
-      profileType: e.profileType,
+      employeeType: profileType(
+        e.profileType === "" ? "officer" : e.profileType
+      ),
+      profileType: e.profileType === "" ? "officer" : e.profileType,
       date: date2Thai(e.date),
       volumeNo: e.volumeNo,
       section: e.section,
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index e6da27b00..8f6970559 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -10,6 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import axios from "axios";
 import genReport from "@/plugins/genreport";
+import genReportXLSX from "@/plugins/genreportxlsx";
 
 import { useOrderPlacementDataStore } from "@/modules/10_order/store";
 
@@ -127,11 +128,19 @@ const downloadCover = async (type: string) => {
 
 // โหลด เอกสารแนบท้าย
 const downloadAttachment = async (type: string) => {
-  genReport(
-    dataAttachment.value,
-    `เอกสารแนบท้าย คำสั่ง ${orderName.value}`,
-    type
-  );
+  if (type === "xlsx") {
+    genReportXLSX(
+      dataAttachmentxlxs.value,
+      `เอกสารแนบท้าย คำสั่ง ${orderName.value}`,
+      type
+    );
+  } else {
+    genReport(
+      dataAttachment.value,
+      `เอกสารแนบท้าย คำสั่ง ${orderName.value}`,
+      type
+    );
+  }
 };
 
 const dataCover = ref<any>();
@@ -151,6 +160,7 @@ const fetchReportCover = async (type: string, orderId: string) => {
 };
 
 const dataAttachment = ref<any>();
+const dataAttachmentxlxs = ref<any>();
 // เรียกไฟล์ เอกสารแนบท้าย
 const fetchReportAttachment = async (type: string, orderId: string) => {
   showLoader();
@@ -164,6 +174,17 @@ const fetchReportAttachment = async (type: string, orderId: string) => {
       messageError($q, e);
       hideLoader();
     });
+
+  showLoader();
+  await http
+    .get(config.API.reportOrderAttachment("xlsx", orderId, code.value))
+    .then(async (res) => {
+      dataAttachmentxlxs.value = res.data.result;
+    })
+    .catch(async (e) => {
+      messageError($q, e);
+      hideLoader();
+    });
 };
 
 function genPDf(data: any) {
@@ -520,6 +541,9 @@ const viewFileUpload = async (url: string) => {
                       v-close-popup
                       @click="downloadAttachment('pdf')"
                     >
+                      <!-- type="a"
+                      :href="orderAttachmentPdf"
+                      target="_blank" -->
                       <q-item-section avatar
                         ><q-icon color="red" name="mdi-file-pdf"
                       /></q-item-section>
@@ -528,10 +552,13 @@ const viewFileUpload = async (url: string) => {
                     <q-item
                       clickable
                       v-close-popup
-                      @click="downloadAttachment('docx')"
+                      @click="downloadAttachment('xlsx')"
                     >
+                      <!-- type="a"
+                      :href="orderAttachmentXlsx"
+                      target="_blank" -->
                       <q-item-section avatar
-                        ><q-icon color="blue" name="mdi-file-word"
+                        ><q-icon color="green-7" name="mdi-file-excel"
                       /></q-item-section>
                       <q-item-section>ไฟล์ .xls</q-item-section>
                     </q-item>
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 063c2c18d..28ed41a94 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -276,7 +276,7 @@ async function onChangeRound() {
 
 /** function เปลี่ยนรอบ*/
 async function onChangeSnap() {
-  agencyFilter.value = "";
+  // agencyFilter.value = "";
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
     await fetchSalalyPeriod(
       agencyFilter.value,