diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 8995fd4f2..98c6ff0a2 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -182,8 +182,8 @@ const fecthlistappointment = async () => {
       rows2.value = rows.value.filter(
         (e: orgFilter) =>
           e.orgName !== null &&
-          e.status !== "ส่งรายชื่อไปออกคำสั่ง" &&
-          e.status !== "ออกคำสั่งเสร็จแล้ว" &&
+          e.status !== "REPORT" &&
+          e.status !== "DONE" &&
           e.educationOld &&
           e.organizationPositionOld &&
           e.positionTypeOld &&
@@ -460,7 +460,43 @@ onMounted(() => {
                               name="mdi-bookmark-outline"
                             />
                           </q-item-section>
-                          <q-item-section>เลือกหน่วยงาน/ตำแหน่ง</q-item-section>
+                          <q-item-section>เลือกหน่วยงานที่รับแต่งตั้ง</q-item-section>
+                        </q-item>
+                        <q-item
+                          clickable
+                          v-close-popup
+                          @click="openModalTree(props.row.personalId)"
+                        >
+                          <q-item-section
+                            style="min-width: 0px"
+                            avatar
+                            class="q-py-sm"
+                          >
+                            <q-icon
+                              color="primary"
+                              size="xs"
+                              name="mdi-bookmark-outline"
+                            />
+                          </q-item-section>
+                          <q-item-section>เลือกหน่วยงานที่รับเลื่อน</q-item-section>
+                        </q-item>
+                        <q-item
+                          clickable
+                          v-close-popup
+                          @click="openModalTree(props.row.personalId)"
+                        >
+                          <q-item-section
+                            style="min-width: 0px"
+                            avatar
+                            class="q-py-sm"
+                          >
+                            <q-icon
+                              color="primary"
+                              size="xs"
+                              name="mdi-bookmark-outline"
+                            />
+                          </q-item-section>
+                          <q-item-section>เลือกหน่วยงานที่รับย้าย</q-item-section>
                         </q-item>
                         <q-item
                           clickable
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 82175059d..a11841734 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -317,39 +317,44 @@ const nextPage = (id: string) => {
   });
 };
 
-function onSave(data:any) {
-  console.log('not save',data)
+function onSave(data: any) {
+  console.log("not save", data);
   const dataAppoint = {
-        recruitDate: data.reportingDate,
-        posNoId: data.posNoId,
-        positionId: data.positionId,
-        positionLevelId: data.posLevelId,
-        positionTypeId: data.posTypeId,
-        // positionLineId: data.positionLineId,
-        // positionPathSideId: data.positionPathSideId,
-
-      };
-      showLoader();
-      http
-        .put(config.API.receivePosition(personalId.value), dataAppoint)
-        .then((res) => {
-          modalTree.value = false
-          success($q, "บันทึกสำเร็จ");
-        })
-        .catch((e) => {
-          messageError($q, e);
-        })
-        .finally(async () => {
-          fecthlistRecevice()
-          hideLoader();
-        });
+    // personalId: data.personalId,
+    node: data.node,
+    nodeId: data.nodeId,
+    orgRevisionId: data.orgRevisionId,
+    positionId: data.positionId,
+    posMasterNo: data.posMasterNo,
+    positionName: data.positionName,
+    posTypeId: data.posTypeId,
+    posTypeName: data.posTypeName,
+    posLevelId: data.posLevelId,
+    posLevelName: data.posLevelName,
+    reportingDate: data.reportingDate,
+    posmasterId: data.posmasterId,
+    typeCommand: data.typeCommand,
+  };
 
+  showLoader();
+  http
+    .put(config.API.receivePosition(personalId.value), dataAppoint)
+    .then((res) => {
+      modalTree.value = false;
+      success($q, "บันทึกสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      fecthlistRecevice();
+      hideLoader();
+    });
 }
 
 onMounted(() => {
   fecthlistRecevice();
 });
-
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">รายการรับโอน</div>
@@ -427,7 +432,12 @@ onMounted(() => {
             </template>
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
-                <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="nextPage(props.row.id)">
+                <q-td
+                  v-for="col in props.cols"
+                  :key="col.name"
+                  :props="props"
+                  @click="nextPage(props.row.id)"
+                >
                   <div v-if="col.name == 'no'">
                     {{ props.rowIndex + 1 }}
                   </div>
@@ -453,11 +463,6 @@ onMounted(() => {
                     }}
                   </div>
                   <div v-else-if="col.name == 'organizationName'">
-                    <div
-                    v-if="
-                      props.row.orgName
-                    "
-                  >
                     <div class="col-4">
                       <div class="text-weight-medium">
                         {{ props.row.root !== null ? props.row.root : "-" }}
@@ -479,13 +484,6 @@ onMounted(() => {
                       </div>
                     </div>
                   </div>
-
-                  <div v-else>
-                    <div class="col-4">
-                      <div class="text-weight-medium">-</div>
-                    </div>
-                  </div>
-                  </div>
                   <div v-else-if="col.name == 'status'">
                     {{ props.row.status ? statusText(props.row.status) : "-" }}
                   </div>
@@ -510,9 +508,7 @@ onMounted(() => {
                         <q-item
                           clickable
                           v-close-popup
-                          @click="
-                            openModalTree(props.row.id, props.row)
-                          "
+                          @click="openModalTree(props.row.id, props.row)"
                         >
                           <q-item-section
                             style="min-width: 0px"