diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 360819b57..f340554db 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -147,7 +147,6 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-
 const columnsPostition = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -222,7 +221,6 @@ const columnsPostition = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-
 const visibleColumns = ref<string[]>([
   "isPosition",
   "no",
@@ -505,7 +503,7 @@ function onSubmit() {
         posmasterId: dataPosMaster.id,
         typeCommand: type.value,
       };
-      props.onSubmit?.(body);
+      await props.onSubmit?.(body);
       close();
     });
   }
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index a3363d966..a7b9e4927 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -744,7 +744,8 @@ function onSubmitDate() {
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
   rowsOrder.value = rows.value.filter(
-    (e: any) => e.nodeName !== null && e.reportingDate !== null
+    (e: any) =>
+      e.nodeName !== null && e.reportingDate !== null && e.statusId !== "REPORT"
   );
   modalOrder.value = val;
 }
@@ -808,6 +809,7 @@ onMounted(async () => {
             <q-btn
               v-if="
                 props.row.statusId !== 'DONE' &&
+                props.row.statusId !== 'REPORT' &&
                 (checkPermission($route)?.attrIsGet ||
                   checkPermission($route)?.attrIsUpdate)
               "
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 973754596..bd4157e6e 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -296,7 +296,7 @@ function openModalOrder() {
   modal.value = true;
 }
 
-function onSave(data: any) {
+async function onSave(data: any) {
   const dataAppoint = {
     node: data.node,
     nodeId: data.nodeId,
@@ -314,7 +314,7 @@ function onSave(data: any) {
   };
 
   showLoader();
-  http
+  await http
     .put(config.API.receivePosition(personalId.value), dataAppoint)
     .then(async () => {
       await fecthlistRecevice();
diff --git a/src/modules/18_command/components/Step/0_Main.vue b/src/modules/18_command/components/Step/0_Main.vue
index cf9415f61..8f8f6be9b 100644
--- a/src/modules/18_command/components/Step/0_Main.vue
+++ b/src/modules/18_command/components/Step/0_Main.vue
@@ -65,8 +65,8 @@ function onConfirmSignature() {
         .put(config.API.command + `/sign/${commandId.value}`, {
           sign: signaturetype.value === "Live" ? true : false,
         })
-        .then(async (res) => {
-          fetchData();
+        .then(async () => {
+          await fetchData();
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/18_command/components/Step/4_Attached.vue b/src/modules/18_command/components/Step/4_Attached.vue
index 8cb41434a..9b32977e7 100644
--- a/src/modules/18_command/components/Step/4_Attached.vue
+++ b/src/modules/18_command/components/Step/4_Attached.vue
@@ -21,6 +21,9 @@ const mixin = useCounterMixin();
 const { messageError, showLoader, hideLoader } = mixin;
 
 const commandId = ref<string>(route.params.id.toString());
+const props = defineProps({
+  formCommandList: { type: Object, required: true },
+});
 
 const isAttachment = defineModel<boolean>("isAttachment", { required: true });
 
@@ -90,14 +93,14 @@ async function downloadCover(type: string) {
   if (tab.value === "main") {
     genReport(
       dataCover.value,
-      "คำสั่ง คำสั่งบรรจุและแต่งตั้ง: สำหรับผู้สอบแข่งขันได้",
+      `คำสั่ง ${props.formCommandList.issue}`,
       type,
       "?folder=command"
     );
   } else {
     genReportXLSX(
       dataAttachment.value,
-      "เอกสารแนบท้าย คำสั่งบรรจุและแต่งตั้ง: สำหรับผู้สอบแข่งขันได้",
+      `เอกสารแนบท้าย ${props.formCommandList.issue}`,
       type,
       "?folder=command"
     );
diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue
index 0314e0e77..b2bba7510 100644
--- a/src/modules/18_command/views/detail.vue
+++ b/src/modules/18_command/views/detail.vue
@@ -180,8 +180,9 @@ onMounted(async () => {
           <q-card>
             <Attached
               v-model:is-change-data="isChangeData"
-              :on-check-change-data="onCheckChangeData"
               v-model:is-attachment="formCommandList.isAttachment"
+              :on-check-change-data="onCheckChangeData"
+              :form-command-list="formCommandList"
             />
           </q-card>
         </q-tab-panel>