diff --git a/src/modules/05_placement/components/Receive/Dialogbody.vue b/src/modules/05_placement/components/Receive/Dialogbody.vue
index 134cddaae..a22cf11f8 100644
--- a/src/modules/05_placement/components/Receive/Dialogbody.vue
+++ b/src/modules/05_placement/components/Receive/Dialogbody.vue
@@ -7,11 +7,14 @@ import type { ResponseRow } from "@/modules/05_placement/interface/response/Rece
 import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useTransferDataStore } from "@/modules/05_placement/store";
 
+const transferStore = useTransferDataStore();
+const { statusText } = transferStore;
 const $q = useQuasar();
 const selected = ref<ResponseRow[]>([]);
 const mixin = useCounterMixin();
-const { showLoader, success, messageError, dialogConfirm, hideLoader } = mixin;
+const { showLoader, success, messageError, dialogConfirm, hideLoader,date2Thai } = mixin;
 
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const visibleColumns2 = ref<string[]>([
@@ -19,9 +22,9 @@ const visibleColumns2 = ref<string[]>([
   "citizenId",
   "fullname",
   "organizationName",
-  "birthday",
-  "dateText",
-  "statusText",
+  "dateOfBirth",
+  "createdAt",
+  "status",
 ]);
 //หัวตาราง
 const columns2 = ref<QTableProps["columns"]>([
@@ -70,22 +73,22 @@ const columns2 = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "birthday",
+    name: "dateOfBirth",
     align: "left",
     label: "วัน/เดือน/ปี เกิด",
     sortable: true,
-    field: "birthday",
+    field: "dateOfBirth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "dateText",
+    name: "createdAt",
     align: "left",
     label: "วันที่ดำเนินการ",
     sortable: true,
-    field: "dateText",
+    field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -93,11 +96,11 @@ const columns2 = ref<QTableProps["columns"]>([
     sortOrder: "da",
   },
   {
-    name: "statusText",
+    name: "status",
     align: "left",
     label: "สถานะ",
     sortable: true,
-    field: "statusText",
+    field: "status",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -174,75 +177,144 @@ watchEffect(() => {
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
-              <q-input borderless outlined dense debounce="300" :model-value="filterKeyword2"
-                @update:model-value="updateInput" placeholder="ค้นหา" style="width: 850px; max-width: auto" >
+              <q-input
+                borderless
+                outlined
+                dense
+                debounce="300"
+                :model-value="filterKeyword2"
+                @update:model-value="updateInput"
+                placeholder="ค้นหา"
+                style="width: 850px; max-width: auto"
+              >
                 <template v-slot:append>
                   <q-icon v-if="filterKeyword2 == ''" name="search" />
-                  <q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="Reset" />
+                  <q-icon
+                    v-if="filterKeyword2 !== ''"
+                    name="clear"
+                    class="cursor-pointer"
+                    @click="Reset"
+                  />
                 </template>
               </q-input>
-              <q-select v-model="visibleColumns2" multiple outlined dense options-dense
-                :display-value="$q.lang.table.columns" emit-value map-options :options="columns2"
-                option-value="name" options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
+              <q-select
+                v-model="visibleColumns2"
+                multiple
+                outlined
+                dense
+                options-dense
+                :display-value="$q.lang.table.columns"
+                emit-value
+                map-options
+                :options="columns2"
+                option-value="name"
+                options-cover
+                style="min-width: 150px"
+                class="gt-xs q-ml-sm"
+              />
             </q-toolbar>
           </div>
         </div>
-
-        <d-table :columns="columns2" :rows="rows2" :filter="filterKeyword2"
-          row-key="personalId" flat :visible-columns="visibleColumns2" selection="multiple"
-          v-model:selected="selected" >
+        <d-table
+          :columns="columns2"
+          :rows="rows2"
+          :filter="filterKeyword2"
+          row-key="personalId"
+          flat
+          :visible-columns="visibleColumns2"
+          selection="multiple"
+          v-model:selected="selected"
+        >
           <template v-slot:header-selection="scope">
-            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td>
-                <q-checkbox keep-color color="primary" dense v-model="props.selected" />
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="props.selected"
+                />
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="citizenId" :props="props" @click="props.nextPage(props.row)" >
-                {{ props.row.citizenId }}
-              </q-td>
-              <q-td key="fullname" :props="props" @click="props.nextPage(props.row)" >
-                {{ props.row.fullname }}
-              </q-td>
-              <q-td key="organizationName" :props="props" @click="props.nextPage(props.row)" >
-                <div v-if=" props.row.orgName !== null || props.row.positionPath !== null " >
+              <q-td
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                @click="props.nextPage(props.row.id)"
+              >
+                <div v-if="col.name == 'no'">
+                  {{ props.rowIndex + 1 }}
+                </div>
+                <div v-else-if="col.name == 'fullname'">
+                  {{
+                    props.row.firstName
+                      ? `${props.row.prefix ?? ""}${
+                          props.row.firstName ?? ""
+                        } ${props.row.lastName ?? ""}`
+                      : "-"
+                  }}
+                </div>
+                <div v-else-if="col.name == 'dateOfBirth'">
+                  {{
+                    props.row.dateOfBirth
+                      ? date2Thai(props.row.dateOfBirth)
+                      : "-"
+                  }}
+                </div>
+                <div v-else-if="col.name == 'createdAt'">
+                  {{
+                    props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
+                  }}
+                </div>
+                <div v-else-if="col.name == 'organizationName'">
                   <div class="col-4">
                     <div class="text-weight-medium">
-                      {{ props.row.orgName !== null ? props.row.orgName : "-" }}
-                      {{ props.row.organizationShortName !== null ? `(${props.row.organizationShortName})` : "" }}
+                      {{ props.row.root !== null ? props.row.root : "-" }}
+                      {{
+                        props.row.rootShortName !== null
+                          ? `(${props.row.rootShortName})`
+                          : ""
+                      }}
                     </div>
                     <div class="text-weight-light">
-                      {{ props.row.positionPath !== null ? props.row.positionPath : "-" }}
-                      {{ props.row.positionNumber !== null ? `(${props.row.positionNumber})` : "" }}
+                      {{
+                        props.row.nodeName !== null ? props.row.nodeName : ""
+                      }}
+                      {{
+                        props.row.nodeShortName !== null
+                          ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
+                          : ""
+                      }}
                     </div>
                   </div>
                 </div>
+                <div v-else-if="col.name == 'status'">
+                  {{ props.row.status ? statusText(props.row.status) : "-" }}
+                </div>
                 <div v-else>
-                  <div class="col-4">
-                    <div class="text-weight-medium">-</div>
-                  </div>
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
-              <q-td key="birthday" :props="props" @click="props.nextPage(props.row)" >
-                {{ props.row.birthday }}
-              </q-td>
-              <q-td key="dateText" :props="props" @click="props.nextPage(props.row)" >
-                {{ props.row.dateText }}
-              </q-td>
-              <q-td key="statusText" :props="props" @click="props.nextPage(props.row)" >
-                {{ props.row.statusText }}
-              </q-td>
+
             </q-tr>
           </template>
         </d-table>
       </q-card-section>
 
       <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="ส่งไปออกคำสั่ง" @click="saveOrder" :disable="checkSelected" color="public" />
+        <q-btn
+          label="ส่งไปออกคำสั่ง"
+          @click="saveOrder"
+          :disable="checkSelected"
+          color="public"
+        />
       </q-card-actions>
     </q-card>
   </q-dialog>
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index 24a5cd8fc..aa2d7a730 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -224,11 +224,11 @@ const getData = async () => {
         age: "",
         prefix: "",
         prefixId:
-          (data.prefixId == "00000000-0000-0000-0000-000000000000"
+          (data.prefix == "00000000-0000-0000-0000-000000000000"
             ? null
-            : data.prefixId) ?? "",
-        firstname: data.firstname ?? "",
-        lastname: data.lastname ?? "",
+            : data.prefix) ?? "",
+        firstname: data.firstName ?? "",
+        lastname: data.lastName ?? "",
         birthDate:
           data.dateOfBirth !== null ? new Date(data.dateOfBirth) : null,
         genderId:
@@ -422,46 +422,53 @@ const conditionSave = async () => {
   }
 };
 
-const saveData = async () => {
-  const body = {
-    citizenId: informaData.value.cardid,
-    prefixId: informaData.value.prefixId,
-    firstname: informaData.value.firstname,
-    lastname: informaData.value.lastname,
-    dateOfBirth:
-      informaData.value.birthDate !== null
-        ? dateToISO(informaData.value.birthDate)
-        : null,
-    genderId: informaData.value.genderId,
-    nationality: informaData.value.nationality,
-    race: informaData.value.ethnicity,
-    religionId: informaData.value.religionId,
-    bloodGroupId: informaData.value.bloodId,
-    relationshipId: informaData.value.statusId,
-    telephoneNumber: informaData.value.tel,
-    reason: reason.value,
-    educationOld: educationOld.value,
-    organizationPositionOld: organizationPositionOld.value,
-    positionTypeOld: positionTypeOld.value,
-    positionLevelOld: positionLevelOld.value,
-    positionNumberOld: posNo.value,
-    amount: 0,
-    amountOld: salary.value,
-  };
-  showLoader();
-  await http
-    .put(config.API.receiveDataId(route.params.id.toString()), body)
-    .then((res: any) => {
-      success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
-      edit.value = false;
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      await getData();
-      hideLoader();
-    });
+function saveData(){
+  dialogConfirm(
+    $q,
+    () => {
+      const body = {
+        citizenId: informaData.value.cardid,
+        prefix: informaData.value.prefixId,
+        firstname: informaData.value.firstname,
+        lastname: informaData.value.lastname,
+        dateOfBirth:
+          informaData.value.birthDate !== null
+            ? dateToISO(informaData.value.birthDate)
+            : null,
+        genderId: informaData.value.genderId,
+        nationality: informaData.value.nationality,
+        race: informaData.value.ethnicity,
+        religionId: informaData.value.religionId,
+        bloodGroupId: informaData.value.bloodId,
+        relationshipId: informaData.value.statusId,
+        telephoneNumber: informaData.value.tel,
+        reason: reason.value,
+        educationOld: educationOld.value,
+        organizationPositionOld: organizationPositionOld.value,
+        positionTypeOld: positionTypeOld.value,
+        positionLevelOld: positionLevelOld.value,
+        positionNumberOld: posNo.value,
+        amount: 0,
+        amountOld: salary.value,
+      };
+      showLoader();
+      http
+        .put(config.API.receiveDataId(route.params.id.toString()), body)
+        .then((res: any) => {
+          success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
+          edit.value = false;
+          getData();
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(async () => {
+          hideLoader();
+        });
+    },
+    "ต้องการแก้ไขข้อมูลหรือไม่?",
+    "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย"
+  );
 };
 
 const getClass = (val: boolean) => {
@@ -493,516 +500,514 @@ onMounted(async () => {
   </div>
   <CardProfile :data="dataProfile as DataProfile" />
 
-
   <q-card bordered class="row col-12 text-dark q-mt-sm">
-    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-      <div class="q-pl-sm text-weight-bold text-dark">
-        แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+    <q-form greedy @submit.prevent @validation-success="saveData">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+        </div>
+        <q-space />
+        <div class="q-gutter-sm" v-if="!edit">
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="mdi-file-edit-outline"
+            class="q-px-sm"
+            label="แก้ไข"
+            style="width: 80px"
+            @click="edit = !edit"
+            v-if="!(status == 'REPORT' || status == 'DONE')"
+          />
+        </div>
+        <div class="q-gutter-sm" v-else>
+          <q-btn
+            type="submit"
+            outline
+            color="public"
+            dense
+            class="q-px-sm"
+            label="บันทึก"
+            style="width: 80px"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            class="q-px-sm"
+            label="ยกเลิก"
+            style="width: 80px"
+            @click="cancel"
+          />
+        </div>
       </div>
-      <q-space />
-      <div class="q-gutter-sm" v-if="!edit">
-        <q-btn
-          outline
-          color="primary"
-          dense
-          icon-right="mdi-file-edit-outline"
-          class="q-px-sm"
-          label="แก้ไข"
-          style="width: 80px"
-          @click="edit = !edit"
-          v-if="!(status == 'REPORT' || status == 'DONE')"
-        />
-      </div>
-      <div class="q-gutter-sm" v-else>
-        <q-btn
-          outline
-          color="public"
-          dense
-          class="q-px-sm"
-          label="บันทึก"
-          style="width: 80px"
-          @click="conditionSave"
-        />
-        <q-btn
-          outline
-          color="red"
-          dense
-          class="q-px-sm"
-          label="ยกเลิก"
-          style="width: 80px"
-          @click="cancel"
-        />
-      </div>
-    </div>
-    <div class="col-12"><q-separator /></div>
-    <q-form ref="myForm">
-      <div class="row col-12 q-pa-md">
-        <div class="col-12 row bg-white">
-          <div class="col-xs-12 row q-col-gutter-md">
-            <div class="col-xs-12">
-              <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
-            </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                v-model="informaData.cardid"
-                dense
-                @update:model-value="changeCardID"
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                label="เลขประจำตัวประชาชน"
-                maxlength="13"
-                mask="#############"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.prefixId"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.prefixOps"
-                option-value="id"
-                :label="`${'คำนำหน้าชื่อ'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps' ) "
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="informaData.firstname"
-                :label="`${'ชื่อ'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3 col-md-3">
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="informaData.lastname"
-                lazy-rules
-                :label="`${'นามสกุล'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <datepicker
-                v-model="informaData.birthDate"
-                :locale="'th'"
-                autoApply
-                :enableTimePicker="false"
-                week-start="0"
-                :max-date="new Date()"
-                :disabled="!edit"
-                @update:model-value="handleDate"
-              >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    :class="getClass(edit)"
-                    hide-bottom-space
-                    :outlined="edit"
-                    dense
-                    :readonly="!edit"
-                    :borderless="!edit"
-                    :model-value="
-                      informaData.birthDate == null
-                        ? null
-                        : date2Thai(informaData.birthDate)
-                    "
-                    :label="`${'วัน/เดือน/ปี เกิด'}`"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        :style="
-                          edit
-                            ? 'color: var(--q-primary)'
-                            : 'color: var(--q-grey)'
-                        "
-                      >
-                      </q-icon>
-                    </template>
-                  </q-input>
-                </template>
-              </datepicker>
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <q-input
-                :class="getClass(false)"
-                hide-bottom-space
-                dense
-                lazy-rules
-                readonly
-                borderless
-                :style="!edit ? '' : 'padding:0 12px;'"
-                :model-value="informaData.age"
-                :label="`${'อายุ'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.genderId"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.genderOps"
-                option-value="id"
-                :label="`${'เพศ'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any,doneFn:Function) => filterSelector(inputValue, doneFn,'genderOps') "
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.statusId"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.statusOps"
-                option-value="id"
-                :label="`${'สถานภาพ'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'statusOps' ) "
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="informaData.nationality"
-                :label="`${'สัญชาติ'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <q-input
-                :class="getClass(edit)"
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="informaData.ethnicity"
-                :label="`${'เชื้อชาติ'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.religionId"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.religionOps"
-                option-value="id"
-                :label="`${'ศาสนา'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any,
+      <div class="col-12"><q-separator /></div>
+
+        <div class="row col-12 q-pa-md">
+          <div class="col-12 row bg-white">
+            <div class="col-xs-12 row q-col-gutter-md">
+              <div class="col-xs-12">
+                <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
+              </div>
+              <div class="col-xs-6 col-sm-3 col-md-3">
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  v-model="informaData.cardid"
+                  dense
+                  @update:model-value="changeCardID"
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  label="เลขประจำตัวประชาชน"
+                  maxlength="13"
+                  mask="#############"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3 col-md-3">
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.prefixId"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.prefixOps"
+                  option-value="id"
+                  :label="`${'คำนำหน้าชื่อ'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps' ) "
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3 col-md-3">
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="informaData.firstname"
+                  :label="`${'ชื่อ'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3 col-md-3">
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="informaData.lastname"
+                  lazy-rules
+                  :label="`${'นามสกุล'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <datepicker
+                  v-model="informaData.birthDate"
+                  :locale="'th'"
+                  autoApply
+                  :enableTimePicker="false"
+                  week-start="0"
+                  :max-date="new Date()"
+                  :disabled="!edit"
+                  @update:model-value="handleDate"
+                >
+                  <template #year="{ year }">
+                    {{ year + 543 }}
+                  </template>
+                  <template #year-overlay-value="{ value }">
+                    {{ parseInt(value + 543) }}
+                  </template>
+                  <template #trigger>
+                    <q-input
+                      :class="getClass(edit)"
+                      hide-bottom-space
+                      :outlined="edit"
+                      dense
+                      :readonly="!edit"
+                      :borderless="!edit"
+                      :model-value="
+                        informaData.birthDate == null
+                          ? null
+                          : date2Thai(informaData.birthDate)
+                      "
+                      :label="`${'วัน/เดือน/ปี เกิด'}`"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          :style="
+                            edit
+                              ? 'color: var(--q-primary)'
+                              : 'color: var(--q-grey)'
+                          "
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <q-input
+                  :class="getClass(false)"
+                  hide-bottom-space
+                  dense
+                  lazy-rules
+                  readonly
+                  borderless
+                  :style="!edit ? '' : 'padding:0 12px;'"
+                  :model-value="informaData.age"
+                  :label="`${'อายุ'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.genderId"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.genderOps"
+                  option-value="id"
+                  :label="`${'เพศ'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any,doneFn:Function) => filterSelector(inputValue, doneFn,'genderOps') "
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.statusId"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.statusOps"
+                  option-value="id"
+                  :label="`${'สถานภาพ'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'statusOps' ) "
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="informaData.nationality"
+                  :label="`${'สัญชาติ'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <q-input
+                  :class="getClass(edit)"
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="informaData.ethnicity"
+                  :label="`${'เชื้อชาติ'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.religionId"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.religionOps"
+                  option-value="id"
+                  :label="`${'ศาสนา'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'religionOps'
                         ) "
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.bloodId"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.bloodOps"
-                option-value="id"
-                :label="`${'หมู่เลือด'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any,
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.bloodId"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.bloodOps"
+                  option-value="id"
+                  :label="`${'หมู่เลือด'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any,
                         doneFn:Function) => filterSelector(inputValue, doneFn,'bloodOps'
                         ) "
-                clearable
-              />
-            </div>
-            <div class="col-xs-6 col-sm-2 col-md-2">
-              <q-input
-                hide-bottom-space
-                :outlined="edit"
-                dense
-                lazy-rules
-                type="tel"
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="informaData.tel"
-                :label="`${'เบอร์โทร'}`"
-                mask="##########"
-              />
-            </div>
-            <div
-              class="col-xs-6 col-sm-3 col-md-3"
-              v-if="informaData.profileType == 'employee'"
-            >
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภทการจ้าง'}`]"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.employeeType"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.employeeTypeOps"
-                option-value="id"
-                :label="`${'ประเภทการจ้าง'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'employeeTypeOps' ) "
-              />
-            </div>
-            <div
-              class="col-xs-6 col-sm-3 col-md-3"
-              v-if="informaData.profileType == 'employee'"
-            >
-              <selector
-                :hide-dropdown-icon="!edit"
-                hide-bottom-space
-                :class="getClass(edit)"
-                :readonly="!edit"
-                :borderless="!edit"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภทลูกจ้าง'}`]"
-                :outlined="edit"
-                dense
-                lazy-rules
-                v-model="informaData.employeeClass"
-                emit-value
-                map-options
-                option-label="name"
-                :options="Ops.employeeClassOps"
-                option-value="id"
-                :label="`${'ประเภทลูกจ้าง'}`"
-                use-input
-                input-debounce="0"
-                @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps' ) "
-              />
-            </div>
-            <div class="col-xs-12">
-              <div class="text-weight-bold">ตำแหน่งและหน่วยงานเดิม</div>
-            </div>
-            <div class="col-xs-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="educationOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกวุฒิ/สาขา'}`]"
-                hide-bottom-space
-                :label="`${'วุฒิ/สาขา'}`"
-                type="textarea"
-                autogrow
-              />
-            </div>
-            <div class="col-xs-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="organizationPositionOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
-                type="textarea"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
-                hide-bottom-space
-                :label="`${'ระดับ'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="posNo"
-                :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
-                hide-bottom-space
-                :label="`${'เลขที่'}`"
-              />
-            </div>
-            <div class="col-xs-6 col-sm-3">
-              <CurrencyInput
-                v-model="salary"
-                :edit="edit"
-                :options="{
-                  currency: 'THB',
-                }"
-                :label="`${'เงินเดือน'}`"
-                :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
-                lazy-rules
-              />
-            </div>
-            <div class="col-xs-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="reason"
-                hide-bottom-space
-                :label="`${'หมายเหตุ '}`"
-                type="textarea"
-              />
+                  clearable
+                />
+              </div>
+              <div class="col-xs-6 col-sm-2 col-md-2">
+                <q-input
+                  hide-bottom-space
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  type="tel"
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="informaData.tel"
+                  :label="`${'เบอร์โทร'}`"
+                  mask="##########"
+                />
+              </div>
+              <div
+                class="col-xs-6 col-sm-3 col-md-3"
+                v-if="informaData.profileType == 'employee'"
+              >
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภทการจ้าง'}`]"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.employeeType"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.employeeTypeOps"
+                  option-value="id"
+                  :label="`${'ประเภทการจ้าง'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'employeeTypeOps' ) "
+                />
+              </div>
+              <div
+                class="col-xs-6 col-sm-3 col-md-3"
+                v-if="informaData.profileType == 'employee'"
+              >
+                <selector
+                  :hide-dropdown-icon="!edit"
+                  hide-bottom-space
+                  :class="getClass(edit)"
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภทลูกจ้าง'}`]"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  v-model="informaData.employeeClass"
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="Ops.employeeClassOps"
+                  option-value="id"
+                  :label="`${'ประเภทลูกจ้าง'}`"
+                  use-input
+                  input-debounce="0"
+                  @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'employeeClassOps' ) "
+                />
+              </div>
+              <div class="col-xs-12">
+                <div class="text-weight-bold">ตำแหน่งและหน่วยงานเดิม</div>
+              </div>
+              <div class="col-xs-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="educationOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกวุฒิ/สาขา'}`,]"
+                  hide-bottom-space
+                  :label="`${'วุฒิ/สาขา'}`"
+                  type="textarea"
+                  
+                  autogrow
+                />
+              </div>
+              <div class="col-xs-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="organizationPositionOld"
+                  :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่ง/สังกัด'}`"
+                  type="textarea"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionTypeOld"
+                  :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่งประเภท'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionLevelOld"
+                  :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                  hide-bottom-space
+                  :label="`${'ระดับ'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="posNo"
+                  :rules="[(val) => !!val || `${'กรุณากรอกเลขที่'}`]"
+                  hide-bottom-space
+                  :label="`${'เลขที่'}`"
+                />
+              </div>
+              <div class="col-xs-6 col-sm-3">
+                <CurrencyInput
+                  v-model="salary"
+                  :edit="edit"
+                  :options="{
+                    currency: 'THB',
+                  }"
+                  :label="`${'เงินเดือน'}`"
+                  :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                  lazy-rules
+                />
+              </div>
+              <div class="col-xs-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="reason"
+                  hide-bottom-space
+                  :label="`${'หมายเหตุ '}`"
+                  type="textarea"
+                />
+              </div>
             </div>
           </div>
         </div>
-      </div>
+
     </q-form>
-    <q-card
-      v-if="rows.length > 0"
-      bordered
-      class="row col-12 text-dark q-mt-sm"
-    >
-      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-        <div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
-      </div>
-      <div class="col-12"><q-separator /></div>
-      <div class="col-12">
-        <d-table
-          :rows="rows"
-          :columns="columns"
-          row-key="fileName"
-          hide-header
-          hide-bottom
-        >
-          <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="fileName" :props="props">
-                {{ props.row.fileName }}
-              </q-td>
-              <q-td key="btnMicrosoft" :props="props">
-                <q-btn
-                  type="a"
-                  target="_blank"
-                  :href="props.row.pathName"
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="picture_as_pdf"
-                >
-                  <q-tooltip>ไฟล์ PDF</q-tooltip>
-                </q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-        </d-table>
-      </div>
-    </q-card>
+  </q-card>
+  <q-card v-if="rows.length > 0" bordered class="row col-12 text-dark q-my-sm">
+    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+      <div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
+    </div>
+    <div class="col-12"><q-separator /></div>
+    <div class="col-12">
+      <d-table
+        :rows="rows"
+        :columns="columns"
+        row-key="fileName"
+        hide-header
+        hide-bottom
+      >
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td key="no" :props="props">
+              {{ props.rowIndex + 1 }}
+            </q-td>
+            <q-td key="fileName" :props="props">
+              {{ props.row.fileName }}
+            </q-td>
+            <q-td key="btnMicrosoft" :props="props">
+              <q-btn
+                type="a"
+                target="_blank"
+                :href="props.row.pathName"
+                flat
+                dense
+                round
+                color="red"
+                icon="picture_as_pdf"
+              >
+                <q-tooltip>ไฟล์ PDF</q-tooltip>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+      </d-table>
+    </div>
   </q-card>
 </template>
 
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index a11841734..ad63f168d 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -56,11 +56,11 @@ const {
 
 const popup = () => {
   const row = filters.value.filter(
-    (r: ResponseRow) =>
+    (r: any) =>
       (r.status == "WAITTING" ||
         r.status == "PENDING" ||
         r.status == "APPROVE") &&
-      r.positionNumber != null &&
+      r.posMasterNo != null &&
       r.educationOld &&
       r.organizationPositionOld &&
       r.positionTypeOld &&