diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index b5956d931..e3c38afce 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -1135,7 +1135,7 @@ const fetchData = async () => {
             durationYear: e.durationYear,
             other: e.other,
             fundName: e.fundName,
-            isDate: e.isDate.toString(),
+            isDate: e.isDate == null ? null : e.isDate.toString(),
             finishDate: new Date(e.finishDate),
             startDate: new Date(e.startDate).getFullYear(),
             endDate: new Date(e.endDate).getFullYear(),
diff --git a/src/modules/04_registry/interface/request/Education.ts b/src/modules/04_registry/interface/request/Education.ts
index d5da9164f..28624d8d2 100644
--- a/src/modules/04_registry/interface/request/Education.ts
+++ b/src/modules/04_registry/interface/request/Education.ts
@@ -19,7 +19,7 @@ interface RequestItemsObject {
   durationYear: number;
   other: string;
   fundName: string;
-  isDate: string;
+  isDate: string | null;
   finishDate: Date;
   startDate: number;
   endDate: number;
diff --git a/src/modules/04_registry/interface/response/Education.ts b/src/modules/04_registry/interface/response/Education.ts
index 832f48e51..86bda975c 100644
--- a/src/modules/04_registry/interface/response/Education.ts
+++ b/src/modules/04_registry/interface/response/Education.ts
@@ -14,7 +14,7 @@ interface ResponseObject {
   durationYear: number;
   other: string;
   fundName: string;
-  isDate: string;
+  isDate: string | null;
   finishDate: Date;
   startDate: number;
   endDate: number;
diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue
index a2f2055b1..5cca4ecb9 100644
--- a/src/modules/05_placement/components/PersonalList/OrgTree.vue
+++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue
@@ -373,10 +373,9 @@ watch(props, () => {
     });
     console.log("personal", personal.value);
   }
-
   // console.log("draft===>", personal.value.draft);
-
-  if (personal.value.draft === false) {
+  
+  if (personal.value && personal.value.draft === false) {
     // const findData = dataRespone.value.find(findByPerson);
     let findData: any = null;
     console.log(dataRespone.value);
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 2eae18436..c05d8a671 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -297,8 +297,8 @@ const saveDeferment = async () => {
               hideLoader();
             });
         })
-        .onCancel(() => {})
-        .onDismiss(() => {});
+        .onCancel(() => { })
+        .onDismiss(() => { });
     }
   });
 };
@@ -338,8 +338,8 @@ const saveDisclaim = async () => {
               hideLoader();
             });
         })
-        .onCancel(() => {})
-        .onDismiss(() => {});
+        .onCancel(() => { })
+        .onDismiss(() => { });
     }
   });
 };
@@ -441,6 +441,10 @@ const validateData = async () => {
   });
 };
 
+const clickCloseSendModal = () => {
+  modaladdlist.value = false
+}
+
 const clickClose = async () => {
   userNote.value = "";
   if (editRow.value == true) {
@@ -537,435 +541,235 @@ const paginationLabel = (start: number, end: number, total: number) => {
 </script>
 <template>
   <q-form ref="myForm">
-    <Table
-      :contain-status="containStatus"
-      :rows="rows"
-      :columns="columns"
-      :filter="filter"
-      :visible-columns="visibleColumns"
-      v-model:inputfilter="filter"
-      v-model:inputvisible="visibleColumns"
-      v-model:editvisible="editvisible"
-      v-model:containfilter="containStatus"
-      @update-modaladdlist="handleModalAddListUpdate"
-      :history="true"
-      :boss="true"
-      :saveNoDraft="true"
-      :role-admin="roleAdmin"
-    >
-      <template #columns="props">
-        <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props.row.personalId)"
-            class="cursor-pointer"
-          >
-            <template v-if="col.name === 'position'">
-              {{ props.rowIndex + 1 }}
-            </template>
-            <template
-              v-else-if="col.name === 'fullName'"
-              class="table_ellipsis"
-            >
-              <div class="row col-12 text-no-wrap items-center">
-                <img
-                  v-if="props.row.avatar == null"
-                  src="@/assets/avatar_user.jpg"
-                  class="col-4 img-info"
-                />
-                <img v-else :src="props.row.avatar" class="col-4 img-info" />
-                <div class="col-4">
-                  <div class="text-weight-medium">{{ props.row.name }}</div>
-                  <div class="text-weight-light">{{ props.row.idCard }}</div>
+      <Table :contain-status="containStatus" :rows="rows" :columns="columns" :filter="filter"
+        :visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
+        v-model:editvisible="editvisible" v-model:containfilter="containStatus"
+        @update-modaladdlist="handleModalAddListUpdate" :history="true" :boss="true" :saveNoDraft="true"
+        :role-admin="roleAdmin">
+        <template #columns="props">
+          <q-tr :props="props">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props.row.personalId)"
+              class="cursor-pointer">
+              <template v-if="col.name === 'position'">
+                {{ props.rowIndex + 1 }}
+              </template>
+              <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
+                <div class="row col-12 text-no-wrap items-center">
+                  <img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
+                  <img v-else :src="props.row.avatar" class="col-4 img-info" />
+                  <div class="col-4">
+                    <div class="text-weight-medium">{{ props.row.name }}</div>
+                    <div class="text-weight-light">{{ props.row.idCard }}</div>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else-if="col.name === 'examNumber'">
-              <div class="text-weight-medium">
-                {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
-              </div>
-            </template>
+              </template>
+              <template v-else-if="col.name === 'examNumber'">
+                <div class="text-weight-medium">
+                  {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
+                </div>
+              </template>
 
-            <template v-else-if="col.name === 'organizationName'">
-              <div
-                v-if="
-                  props.row.orgName !== null || props.row.positionPath !== null
-                "
-              >
-                <div class="col-4">
-                  <div class="text-weight-medium">
-                    {{ props.row.orgName !== null ? props.row.orgName : "-" }}
-                    {{
-                      props.row.organizationShortName !== null
+              <template v-else-if="col.name === 'organizationName'">
+                <div v-if="props.row.orgName !== null || props.row.positionPath !== null
+                  ">
+                  <div class="col-4">
+                    <div class="text-weight-medium">
+                      {{ props.row.orgName !== null ? props.row.orgName : "-" }}
+                      {{
+                        props.row.organizationShortName !== null
                         ? `(${props.row.organizationShortName})`
                         : ""
-                    }}
-                  </div>
-                  <div class="text-weight-light">
-                    {{
-                      props.row.positionPath !== null
+                      }}
+                    </div>
+                    <div class="text-weight-light">
+                      {{
+                        props.row.positionPath !== null
                         ? props.row.positionPath
                         : "-"
-                    }}
-                    {{
-                      props.row.positionNumber !== null
+                      }}
+                      {{
+                        props.row.positionNumber !== null
                         ? `(${props.row.positionNumber})`
                         : ""
-                    }}
+                      }}
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div v-else>
-                <div class="col-4">
-                  <div class="text-weight-medium">-</div>
+                <div v-else>
+                  <div class="col-4">
+                    <div class="text-weight-medium">-</div>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else-if="col.name === 'positionCandidate'">
-              <div
-                class="text-weight-medium"
-                v-if="props.row.positionCandidate == null"
-              >
-                -
-              </div>
-              <div class="text-weight-medium" v-else>
-                {{ props.row.positionCandidate }}
-              </div>
-            </template>
-            <template
-              v-else-if="col.name === 'reportingDate' && col.value !== '-'"
-            >
-              <div class="text-weight-medium">
-                {{ props.row.reportingDate }}
-              </div>
-            </template>
-            <template v-else-if="col.name === 'bmaOfficer'">
-              <div class="text-weight-medium">
-                {{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
-              </div>
-            </template>
-            <template v-else-if="col.name === 'draft'">
-              <div class="text-weight-medium">
-                {{ props.row.draft }}
-              </div>
-            </template>
-            <template v-else-if="col.name === 'statusName'">
-              <div class="text-weight-medium">
-                {{ props.row.statusName }}
-              </div>
-            </template>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              icon="mdi-dots-vertical"
-              size="12px"
-              color="grey-7"
-              flat
-              round
-              dense
-            >
-              <q-menu transition-show="jump-down" transition-hide="jump-up">
-                <q-list dense style="min-width: 100px">
-                  <q-item
-                    v-if="
-                      (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
-                      props.row.draft === 'รอส่งตัว'
-                    "
-                    clickable
-                    v-close-popup
-                    @click="openAppointModal(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-separator />
-                  <q-item
-                    v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'"
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'deferment')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="blue"
-                        size="xs"
-                        name="mdi-account-alert-outline"
-                      />
-                    </q-item-section>
-                    <q-item-section>ขอผ่อนผัน</q-item-section>
-                  </q-item>
-                  <q-item
-                    v-else-if="
-                      props.row.deferment === true &&
-                      props.row.statusId != 'DISCLAIM'
-                    "
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'defermentInfo')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="blue"
-                        size="xs"
-                        name="mdi-account-details-outline"
-                      />
-                    </q-item-section>
-                    <q-item-section>ข้อมูลการผ่อนผัน</q-item-section>
-                  </q-item>
-                  <q-separator />
-                  <q-item
-                    v-if="
-                      props.row.statusId === 'UN-CONTAIN' ||
-                      props.row.statusId === 'PREPARE-CONTAIN'
-                    "
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'disclaim')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="pink"
-                        size="xs"
-                        name="mdi-account-cancel-outline"
-                      />
-                    </q-item-section>
-                    <q-item-section>สละสิทธิ์</q-item-section>
-                  </q-item>
-                  <q-item
-                    v-else-if="props.row.statusId === 'DISCLAIM'"
-                    clickable
-                    v-close-popup
-                    @click="editDetail(props.row, 'disclaimInfo')"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="pink"
-                        size="xs"
-                        name="mdi-account-cancel-outline"
-                      />
-                    </q-item-section>
-                    <q-item-section>ข้อมูลการสละสิทธิ์</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
-            </q-btn>
-          </q-td>
-        </q-tr>
-      </template>
-    </Table>
-  </q-form>
-
-  <!-- เลือกหน่วยงานที่บรรจุ -->
-  <DialogOrgTree
-    v-model:modal="appointModal"
-    :personalId="personalId"
-    :close="clickCloseModalTree"
-    :personal="personal"
-  />
-
-  <!-- popup ขอผ่อนผัน / สละสิทธิ์ -->
-  <q-form ref="myForm">
-    <DialogCard
-      v-model:Modal="modal"
-      :personal-id="personalId"
-      :close="clickClose"
-      :validate="validateData"
-    />
-  </q-form>
-  <q-dialog v-model="modalDefermentDisclaim" persistent>
-    <q-card style="width: 800px">
-      <q-form ref="myForm">
-        <DialogHeader
-          :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`"
-          :close="clickClose"
-        />
-        <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="col-xs-12 col-sm-12 col-md-12">
-            <q-input
-              :class="getClass(edit)"
-              hide-bottom-space
-              :outlined="edit"
-              dense
-              lazy-rules
-              :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="userNote"
-              :label="`${'กรอกเหตุผล'}`"
-              @update:model-value="clickEditRow"
-              type="textarea"
-            />
-            <q-file
-              v-if="getNumFile === 1"
-              v-model="files"
-              dense
-              :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
-              outlined
-              use-chips
-              :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
-              multiple
-              @update:model-value="clickEditRow"
-              class="q-py-sm"
-            >
-              <template v-slot:prepend>
-                <q-icon name="attach_file" color="primary" />
               </template>
-            </q-file>
-          </div>
-        </q-card-section>
-        <q-separator />
-        <DialogFooter
-          :editvisible="true"
-          :validate="validateData"
-          :save="modalDisclaim ? saveDisclaim : saveDeferment"
-        />
-      </q-form>
-    </q-card>
-  </q-dialog>
+              <template v-else-if="col.name === 'positionCandidate'">
+                <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
+                  -
+                </div>
+                <div class="text-weight-medium" v-else>
+                  {{ props.row.positionCandidate }}
+                </div>
+              </template>
+              <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
+                <div class="text-weight-medium">
+                  {{ props.row.reportingDate }}
+                </div>
+              </template>
+              <template v-else-if="col.name === 'bmaOfficer'">
+                <div class="text-weight-medium">
+                  {{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
+                </div>
+              </template>
+              <template v-else-if="col.name === 'draft'">
+                <div class="text-weight-medium">
+                  {{ props.row.draft }}
+                </div>
+              </template>
+              <template v-else-if="col.name === 'statusName'">
+                <div class="text-weight-medium">
+                  {{ props.row.statusName }}
+                </div>
+              </template>
+            </q-td>
+            <q-td auto-width>
+              <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
+                <q-menu transition-show="jump-down" transition-hide="jump-up">
+                  <q-list dense style="min-width: 100px">
+                    <q-item v-if="(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
+                      props.row.draft === 'รอส่งตัว'
+                      " clickable v-close-popup @click="openAppointModal(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>
 
-  <!-- dialog ข้อมูลขอผ่อนผัน / สละสิทธิ์ -->
-  <q-dialog v-model="modalwaitInfo" persistent>
-    <q-card style="width: 500px; max-width: 500px">
-      <q-form ref="myForm">
-        <DialogHeader
-          :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`"
-          :close="clickClose"
-        />
+                    <q-separator />
+                    <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
+                      @click="editDetail(props.row, 'deferment')">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
+                      </q-item-section>
+                      <q-item-section>ขอผ่อนผัน</q-item-section>
+                    </q-item>
+                    <q-item v-else-if="props.row.deferment === true &&
+                      props.row.statusId != 'DISCLAIM'
+                      " clickable v-close-popup @click="editDetail(props.row, 'defermentInfo')">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-icon color="blue" size="xs" name="mdi-account-details-outline" />
+                      </q-item-section>
+                      <q-item-section>ข้อมูลการผ่อนผัน</q-item-section>
+                    </q-item>
+                    <q-separator />
+                    <q-item v-if="props.row.statusId === 'UN-CONTAIN' ||
+                      props.row.statusId === 'PREPARE-CONTAIN'
+                      " clickable v-close-popup @click="editDetail(props.row, 'disclaim')">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
+                      </q-item-section>
+                      <q-item-section>สละสิทธิ์</q-item-section>
+                    </q-item>
+                    <q-item v-else-if="props.row.statusId === 'DISCLAIM'" clickable v-close-popup
+                      @click="editDetail(props.row, 'disclaimInfo')">
+                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
+                      </q-item-section>
+                      <q-item-section>ข้อมูลการสละสิทธิ์</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+      </Table>
+    </q-form>
+
+    <!-- เลือกหน่วยงานที่บรรจุ -->
+    <DialogOrgTree v-model:modal="appointModal" :personalId="personalId" :close="clickCloseModalTree"
+      :personal="personal" />
+
+    <!-- popup ขอผ่อนผัน / สละสิทธิ์ -->
+    <q-form ref="myForm">
+      <DialogCard v-model:Modal="modal" :personal-id="personalId" :close="clickClose" :validate="validateData" />
+    </q-form>
+    <q-dialog v-model="modalDefermentDisclaim" persistent>
+      <q-card style="width: 800px">
+        <q-form ref="myForm">
+          <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`" :close="clickClose" />
+          <q-separator />
+          <q-card-section class="q-p-sm">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <q-input :class="getClass(edit)" hide-bottom-space :outlined="edit" dense lazy-rules
+                :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']" :readonly="!edit" :borderless="!edit" v-model="userNote"
+                :label="`${'กรอกเหตุผล'}`" @update:model-value="clickEditRow" type="textarea" />
+              <q-file v-if="getNumFile === 1" v-model="files" dense :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`" outlined
+                use-chips :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']" multiple
+                @update:model-value="clickEditRow" class="q-py-sm">
+                <template v-slot:prepend>
+                  <q-icon name="attach_file" color="primary" />
+                </template>
+              </q-file>
+            </div>
+          </q-card-section>
+          <q-separator />
+          <DialogFooter :editvisible="true" :validate="validateData" :save="modalDisclaim ? saveDisclaim : saveDeferment" />
+        </q-form>
+      </q-card>
+    </q-dialog>
+
+    <!-- dialog ข้อมูลขอผ่อนผัน / สละสิทธิ์ -->
+    <q-dialog v-model="modalwaitInfo" persistent>
+      <q-card style="width: 500px; max-width: 500px">
+        <q-form ref="myForm">
+          <DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ชื่อ${Name}`" :close="clickClose" />
+          <q-separator />
+          <q-card-section class="q-p-sm">
+            <div class="row">
+              <div class="col-3 text-grey-7">เหตุผล</div>
+              <div class="col-4">{{ dataInfo.reason }}</div>
+            </div>
+            <div v-if="!modalDisclaim" class="row q-pt-md">
+              <div class="col-3 text-grey-7 q-mt-sm">เอกสารหลักฐาน</div>
+              <div class="col-2 q-mt-sm">
+                <q-btn type="a" :href="dataInfo.reliefDoc" color="primary" flat dense round size="14px" icon="mdi-download"
+                  target="_blank" />
+              </div>
+            </div>
+          </q-card-section>
+          <q-separator />
+        </q-form>
+      </q-card>
+    </q-dialog>
+
+    <!-- dialog เพิ่มรายชื่อ -->
+    <q-dialog v-model="modaladdlist">
+      <q-card style="width: 900px; max-width: 80vw">
+        <DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
         <q-separator />
-        <q-card-section class="q-p-sm">
-          <div class="row">
-            <div class="col-3 text-grey-7">เหตุผล</div>
-            <div class="col-4">{{ dataInfo.reason }}</div>
-          </div>
-          <div v-if="!modalDisclaim" class="row q-pt-md">
-            <div class="col-3 text-grey-7 q-mt-sm">เอกสารหลักฐาน</div>
-            <div class="col-2 q-mt-sm">
-              <q-btn
-                type="a"
-                :href="dataInfo.reliefDoc"
-                color="primary"
-                flat
-                dense
-                round
-                size="14px"
-                icon="mdi-download"
-                target="_blank"
-              />
+        <q-card-section class="q-pt-none">
+          <div class="row justify-end">
+            <div class="col-5">
+              <q-toolbar style="padding: 0">
+                <q-input borderless outlined dense debounce="300" v-model="filterlistAdd" placeholder="ค้นหา"
+                  style="width: 850px; max-width: auto">
+                  <template v-slot:append>
+                    <q-icon name="search" />
+                  </template>
+                </q-input>
+                <q-select v-model="visibleColumnslist" multiple outlined dense options-dense
+                  :display-value="$q.lang.table.columns" emit-value map-options :options="columns" option-value="name"
+                  options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
+              </q-toolbar>
             </div>
           </div>
-        </q-card-section>
-        <q-separator />
-      </q-form>
-    </q-card>
-  </q-dialog>
 
-  <!-- dialog เพิ่มรายชื่อ -->
-  <q-dialog v-model="modaladdlist">
-    <q-card style="width: 900px; max-width: 80vw">
-      <q-card-section>
-        <q-toolbar class="q-py-md">
-          <q-toolbar-title class="header-text text-weight-bolder"
-            >ส่งรายชื่อไปยังหน่วยงาน
-          </q-toolbar-title>
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            @click="modaladdlist = false"
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-toolbar>
-      </q-card-section>
-      <q-card-section class="q-pt-none">
-        <div class="row justify-end">
-          <div class="col-5">
-            <q-toolbar style="padding: 0">
-              <q-input
-                borderless
-                outlined
-                dense
-                debounce="300"
-                v-model="filterlistAdd"
-                placeholder="ค้นหา"
-                style="width: 850px; max-width: auto"
-              >
-                <template v-slot:append>
-                  <q-icon name="search" />
-                </template>
-              </q-input>
-              <q-select
-                v-model="visibleColumnslist"
-                multiple
-                outlined
-                dense
-                options-dense
-                :display-value="$q.lang.table.columns"
-                emit-value
-                map-options
-                :options="columns"
-                option-value="name"
-                options-cover
-                style="min-width: 150px"
-                class="gt-xs q-ml-sm"
-              />
-            </q-toolbar>
-          </div>
-        </div>
-
-        <q-table
-          flat
-          bordered
-          dense
-          :rows="rowsFilter"
-          :columns="columns"
-          :filter="filterlistAdd"
-          row-key="name"
-          class="custom-header-table"
-          selection="multiple"
-          v-model:selected="selected"
-          :pagination-label="paginationLabel"
-          :visible-columns="visibleColumnslist"
-        >
-          <template v-slot:header-selection="scope">
-            <q-checkbox
-              keep-color
-              color="primary"
-              dense
-              v-model="scope.selected"
-            />
-          </template>
-          <!-- <template v-slot:body-selection="scope">
+          <q-table flat bordered dense :rows="rowsFilter" :columns="columns" :filter="filterlistAdd" row-key="name"
+            class="custom-header-table" selection="multiple" v-model:selected="selected" :pagination-label="paginationLabel"
+            :visible-columns="visibleColumnslist">
+            <template v-slot:header-selection="scope">
+              <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
+            </template>
+            <!-- <template v-slot:body-selection="scope">
             <q-checkbox
               keep-color
               color="primary"
@@ -973,153 +777,112 @@ const paginationLabel = (start: number, end: number, total: number) => {
               v-model="scope.selected"
             />
           </template> -->
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td>
-                <q-checkbox
-                  keep-color
-                  color="primary"
-                  dense
-                  v-model="props.selected"
-                />
-              </q-td>
-              <q-td
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                class="cursor-pointer"
-              >
-                <template v-if="col.name === 'position'">
-                  {{ props.rowIndex + 1 }}
-                </template>
-                <template
-                  v-else-if="col.name === 'fullName'"
-                  class="table_ellipsis"
-                >
-                  <div class="row col-12 text-no-wrap items-center">
-                    <img
-                      v-if="props.row.avatar == null"
-                      src="@/assets/avatar_user.jpg"
-                      class="col-4 img-info"
-                    />
-                    <img
-                      v-else
-                      :src="props.row.avatar"
-                      class="col-4 img-info"
-                    />
-                    <div class="col-4">
-                      <div class="text-weight-medium">{{ props.row.name }}</div>
-                      <div class="text-weight-light">
-                        {{ props.row.idCard }}
+            <template v-slot:body="props">
+              <q-tr :props="props">
+                <q-td>
+                  <q-checkbox keep-color color="primary" dense v-model="props.selected" />
+                </q-td>
+                <q-td v-for="col in props.cols" :key="col.name" :props="props" class="cursor-pointer">
+                  <template v-if="col.name === 'position'">
+                    {{ props.rowIndex + 1 }}
+                  </template>
+                  <template v-else-if="col.name === 'fullName'" class="table_ellipsis">
+                    <div class="row col-12 text-no-wrap items-center">
+                      <img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
+                      <img v-else :src="props.row.avatar" class="col-4 img-info" />
+                      <div class="col-4">
+                        <div class="text-weight-medium">{{ props.row.name }}</div>
+                        <div class="text-weight-light">
+                          {{ props.row.idCard }}
+                        </div>
                       </div>
                     </div>
-                  </div>
-                </template>
-                <template v-else-if="col.name === 'examNumber'">
-                  <div class="text-weight-medium">
-                    {{
-                      props.row.examNumber !== null ? props.row.examNumber : "-"
-                    }}
-                  </div>
-                </template>
+                  </template>
+                  <template v-else-if="col.name === 'examNumber'">
+                    <div class="text-weight-medium">
+                      {{
+                        props.row.examNumber !== null ? props.row.examNumber : "-"
+                      }}
+                    </div>
+                  </template>
 
-                <template v-else-if="col.name === 'organizationName'">
-                  <div
-                    v-if="
-                      props.row.orgName !== null ||
+                  <template v-else-if="col.name === 'organizationName'">
+                    <div v-if="props.row.orgName !== null ||
                       props.row.positionPath !== null
-                    "
-                  >
-                    <div class="col-4">
-                      <div class="text-weight-medium">
-                        {{
-                          props.row.orgName !== null ? props.row.orgName : "-"
-                        }}
-                        {{
-                          props.row.organizationShortName !== null
+                      ">
+                      <div class="col-4">
+                        <div class="text-weight-medium">
+                          {{
+                            props.row.orgName !== null ? props.row.orgName : "-"
+                          }}
+                          {{
+                            props.row.organizationShortName !== null
                             ? `(${props.row.organizationShortName})`
                             : ""
-                        }}
-                      </div>
-                      <div class="text-weight-light">
-                        {{
-                          props.row.positionPath !== null
+                          }}
+                        </div>
+                        <div class="text-weight-light">
+                          {{
+                            props.row.positionPath !== null
                             ? props.row.positionPath
                             : "-"
-                        }}
-                        {{
-                          props.row.positionNumber !== null
+                          }}
+                          {{
+                            props.row.positionNumber !== null
                             ? `(${props.row.positionNumber})`
                             : ""
-                        }}
+                          }}
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <div v-else>
-                    <div class="col-4">
-                      <div class="text-weight-medium">-</div>
+                    <div v-else>
+                      <div class="col-4">
+                        <div class="text-weight-medium">-</div>
+                      </div>
                     </div>
-                  </div>
-                </template>
-                <template v-else-if="col.name === 'positionCandidate'">
-                  <div
-                    class="text-weight-medium"
-                    v-if="props.row.positionCandidate == null"
-                  >
-                    -
-                  </div>
-                  <div class="text-weight-medium" v-else>
-                    {{ props.row.positionCandidate }}
-                  </div>
-                </template>
-                <template
-                  v-else-if="col.name === 'reportingDate' && col.value !== '-'"
-                >
-                  <div class="text-weight-medium">
-                    {{ props.row.reportingDate }}
-                  </div>
-                </template>
-                <template v-else-if="col.name === 'bmaOfficer'">
-                  <div class="text-weight-medium">
-                    {{
-                      props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-"
-                    }}
-                  </div>
-                </template>
-                <template v-else-if="col.name === 'draft'">
-                  <div class="text-weight-medium">
-                    {{ props.row.draft }}
-                  </div>
-                </template>
-                <template v-else-if="col.name === 'statusName'">
-                  <div class="text-weight-medium">
-                    {{ props.row.statusName }}
-                  </div>
-                </template>
-              </q-td>
-            </q-tr>
-          </template>
-          <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
-          </template>
-        </q-table>
-      </q-card-section>
+                  </template>
+                  <template v-else-if="col.name === 'positionCandidate'">
+                    <div class="text-weight-medium" v-if="props.row.positionCandidate == null">
+                      -
+                    </div>
+                    <div class="text-weight-medium" v-else>
+                      {{ props.row.positionCandidate }}
+                    </div>
+                  </template>
+                  <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
+                    <div class="text-weight-medium">
+                      {{ props.row.reportingDate }}
+                    </div>
+                  </template>
+                  <template v-else-if="col.name === 'bmaOfficer'">
+                    <div class="text-weight-medium">
+                      {{
+                        props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-"
+                      }}
+                    </div>
+                  </template>
+                  <template v-else-if="col.name === 'draft'">
+                    <div class="text-weight-medium">
+                      {{ props.row.draft }}
+                    </div>
+                  </template>
+                  <template v-else-if="col.name === 'statusName'">
+                    <div class="text-weight-medium">
+                      {{ props.row.statusName }}
+                    </div>
+                  </template>
+                </q-td>
+              </q-tr>
+            </template>
+            <template v-slot:pagination="scope">
+              <q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
+                boundary-links direction-links></q-pagination>
+            </template>
+          </q-table>
+        </q-card-section>
 
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn
-          flat
-          label="ยืนยันการส่งตัว"
-          @click="savelist"
-          :disable="checkSelected"
-        />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <q-btn label="บันทึก" @click="savelist" :disable="checkSelected" color="public" />
       </q-card-actions>
     </q-card>
   </q-dialog>
diff --git a/src/modules/05_placement/components/probation/AddWork.vue b/src/modules/05_placement/components/probation/FormAssign.vue
similarity index 100%
rename from src/modules/05_placement/components/probation/AddWork.vue
rename to src/modules/05_placement/components/probation/FormAssign.vue
diff --git a/src/modules/05_placement/components/probation/form.vue b/src/modules/05_placement/components/probation/FormEvaluation.vue
similarity index 100%
rename from src/modules/05_placement/components/probation/form.vue
rename to src/modules/05_placement/components/probation/FormEvaluation.vue
diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue
index 9a77753f8..3151f15ee 100644
--- a/src/modules/05_placement/components/probation/MainDetail.vue
+++ b/src/modules/05_placement/components/probation/MainDetail.vue
@@ -1,141 +1,171 @@
 <template>
 	<!-- <div class="toptitle text-dark col-12 row items-center">จัดการบัญชี 2</div> -->
-  <q-card flat bordered class="col-12">
-    <q-layout
-      view="hHh Lpr lff"
-      container
-      class="shadow-2 rounded-borders page-relative"
-      style="height: 82vh"
-    >
+	<q-card flat bordered class="col-12">
+		<q-layout view="hHh Lpr lff" container class="shadow-2 rounded-borders page-relative" style="height: 82vh">
 			<q-header class="bg-grey-1">
 				<q-toolbar>
 					<div class="text-h6 text-weight-medium text-dark col-12 row items-center q-py-md">
-						<q-btn
-							icon="mdi-arrow-left"
-							unelevated
-							round
-							dense
-							flat
-							color="primary"
-							class="q-mr-sm"
-							@click="router.go(-1)"
-						/>
-							บันทึกผลการทดลองปฏิบัติหน้าที่ราชการของ นายสมคิด ยอดใจ
+						<q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm"
+							@click="router.go(-1)" />
+						บันทึกผลการทดลองปฏิบัติหน้าที่ราชการของ นายสมคิด ยอดใจ
 					</div>
 				</q-toolbar>
-				<q-separator/>
+				<q-separator />
 			</q-header>
-			<q-drawer
-        v-model="drawer"
-        show-if-above
-
-				:width="150"
-        :breakpoint="500"
-				class="bg-grey-1"
-        bordered
-      >
-        <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: 0 }">
-          <q-list class="text-grey-7">
-            <q-item 
-							dense
-							active
-							class="q-py-sm"
-							active-class="text-primary bg-teal-1 text-weight-medium"
-							clickable 
+			<q-drawer v-model="drawer" show-if-above :width="150" :breakpoint="500" class="bg-grey-1" bordered>
+				<q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: 0 }">
+					<q-list class="text-grey-7">
+						<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
 							v-ripple>
-              <q-item-section avatar style="min-width: 40px">
-                <q-icon size="18px" name="mdi-file-edit" />
-              </q-item-section>
+							<q-item-section avatar style="min-width: 40px">
+								<q-icon size="18px" name="mdi-file" />
+							</q-item-section>
 
-              <q-item-section>
-                บันทึกผล
-              </q-item-section>
-            </q-item>
+							<q-item-section>
+								แบบมอบหมายงาน
+							</q-item-section>
+						</q-item>
 
-            <q-item 
-							active-class="text-primary bg-teal-1 text-weight-medium"
-							clickable
-							class="q-py-sm"
-							dense 
+						<q-item dense active class="q-py-sm" active-class="text-primary bg-teal-1 text-weight-medium"
+							clickable v-ripple>
+							<q-item-section avatar style="min-width: 40px">
+								<q-icon size="18px" name="mdi-file-edit" />
+							</q-item-section>
+
+							<q-item-section>
+								บันทึกผลการทดลองปฏิบัติหน้าที่ราชการ
+							</q-item-section>
+						</q-item>
+
+						<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
 							v-ripple>
-              <q-item-section avatar style="min-width: 40px">
-                <q-icon size="18px" name="mdi-file-star" />
-              </q-item-section>
+							<q-item-section avatar style="min-width: 40px">
+								<q-icon size="18px" name="mdi-file-star" />
+							</q-item-section>
 
-              <q-item-section>
-                ประเมินผล
-              </q-item-section>
-            </q-item>
+							<q-item-section>
+								ประเมินผลการทดลองปฏิบัติหน้าที่ราชการ
+							</q-item-section>
+						</q-item>
 
-            <q-item 
-							active-class="text-primary bg-teal-1 text-weight-medium"
-							clickable 
-							class="q-py-sm"
-							dense
+						<q-item active-class="text-primary bg-teal-1 text-weight-medium" clickable class="q-py-sm" dense
 							v-ripple>
-              <q-item-section avatar style="min-width: 40px">
-                <q-icon size="18px" name="mdi-file-chart" />
-              </q-item-section>
+							<q-item-section avatar style="min-width: 40px">
+								<q-icon size="18px" name="mdi-file-chart" />
+							</q-item-section>
 
-              <q-item-section>
-                รายการ
-              </q-item-section>
-            </q-item>
-          </q-list>
-        </q-scroll-area>
-      </q-drawer>
-      <q-page-container>
-				<q-layout
-					view="hHh Lpr lff"
-					container
-					style="height: 72vh"
-				>
+							<q-item-section>
+								รายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ
+							</q-item-section>
+						</q-item>
+					</q-list>
+				</q-scroll-area>
+			</q-drawer>
+			<q-page-container>
+				<q-layout view="hHh Lpr lff" container style="height: 72vh">
 					<q-header class="bg-grey-1">
-							<div class="bg-grey-1">
-									<div class="col-12 row q-gutter-x-md items-center">
-										<q-tabs dense v-model="tab" active-class="text-primary text-weight-medium" indicator-color="grey-1" class="text-grey-7">
-											<q-tab name="save1" label="บันทึกผลครั้งที่ 1" />
-											<q-tab name="save2" label="บันทึกผลครั้งที่ 2" />
-											<q-tab name="save3" label="บันทึกผลครั้งที่ 3" />
-										</q-tabs>
-										<div>
-											<q-btn color="blue" flat dense icon="mdi-plus">
-												<q-tooltip>
-													เพิ่มบันทึกผลการทดลอง
-												</q-tooltip>
-											</q-btn>
-										</div>
-									</div>
-								<q-separator/>
+						<div class="bg-grey-1">
+							<div class="col-12 row q-gutter-x-md items-center">
+								<q-tabs dense v-model="tab" active-class="text-primary text-weight-medium"
+									indicator-color="grey-1" class="text-grey-7">
+									<q-tab name="save1" label="บันทึกผลครั้งที่ 1" />
+									<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save1'"
+										:color="tab !== 'save1' ? 'grey' : 'add'">
+										<q-tooltip>ดาวน์โหลด</q-tooltip>
+										<q-menu>
+											<q-list style="min-width: 150px">
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="red"
+															name="mdi-file-pdf" /></q-item-section>
+													<q-item-section>ไฟล์ .PDF</q-item-section>
+												</q-item>
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="blue"
+															name="mdi-file-word" /></q-item-section>
+													<q-item-section>ไฟล์ .docx</q-item-section>
+												</q-item>
+											</q-list>
+										</q-menu>
+									</q-btn>
+
+									<q-tab name="save2" label="บันทึกผลครั้งที่ 2" />
+									<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save2'"
+										:color="tab !== 'save2' ? 'grey' : 'add'">
+										<q-tooltip>ดาวน์โหลด</q-tooltip>
+										<q-menu>
+											<q-list style="min-width: 150px">
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="red"
+															name="mdi-file-pdf" /></q-item-section>
+													<q-item-section>ไฟล์ .PDF</q-item-section>
+												</q-item>
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="blue"
+															name="mdi-file-word" /></q-item-section>
+													<q-item-section>ไฟล์ .docx</q-item-section>
+												</q-item>
+											</q-list>
+										</q-menu>
+									</q-btn>
+									<!-- <q-tab name="save3" label="บันทึกผลครั้งที่ 3" />
+									<q-btn size="12px" flat dense icon="mdi-download" :disable="tab !== 'save3'"
+										:color="tab !== 'save3' ? 'grey' : 'add'">
+										<q-tooltip>ดาวน์โหลด</q-tooltip>
+										<q-menu>
+											<q-list style="min-width: 150px">
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="red"
+															name="mdi-file-pdf" /></q-item-section>
+													<q-item-section>ไฟล์ .PDF</q-item-section>
+												</q-item>
+												<q-item clickable v-close-popup>
+													<q-item-section avatar><q-icon color="blue"
+															name="mdi-file-word" /></q-item-section>
+													<q-item-section>ไฟล์ .docx</q-item-section>
+												</q-item>
+											</q-list>
+										</q-menu>
+									</q-btn> -->
+								</q-tabs>
+								<div>
+									<q-btn color="blue" flat dense icon="mdi-plus">
+										<q-tooltip>
+											เพิ่มบันทึกผลการทดลอง
+										</q-tooltip>
+									</q-btn>
+								</div>
 							</div>
-						</q-header>
-						<q-page-container>
-							<div class="col-12 row">
-								<Form />
-							</div>
-						</q-page-container>
-					</q-layout>
-    	</q-page-container>
-    </q-layout>
+							<q-separator />
+						</div>
+					</q-header>
+					<q-page-container>
+						<div class="col-12 row">
+							<Form />
+						</div>
+					</q-page-container>
+				</q-layout>
+			</q-page-container>
+		</q-layout>
 	</q-card>
 </template>
 <script setup lang="ts">
 import { useRouter } from "vue-router";
 import { ref } from "vue";
-import Form from "@/modules/05_placement/components/probation/form.vue";
+import Form from "@/modules/05_placement/components/probation/FormEvaluation.vue";
 
 const router = useRouter();
 const drawer = ref<boolean>(true);
-const	tab = ref('save1');
+const tab = ref('save1');
 </script>
 <style lang="scss" scope>
 .btn-absolute {
-  z-index: 50;
-  position: absolute;
-  left: 200px;
-  top: 10px;
+	z-index: 50;
+	position: absolute;
+	left: 200px;
+	top: 10px;
 }
+
 .btnShadow {
-  box-shadow: 0 1px 2px rgb(0 0 0 / 10%), 3px 3px 7px 1px rgba(95, 95, 95, 0.15) !important;
+	box-shadow: 0 1px 2px rgb(0 0 0 / 10%), 3px 3px 7px 1px rgba(95, 95, 95, 0.15) !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue
index ae6c58474..7faf54272 100644
--- a/src/modules/05_placement/components/probation/ProbationDetail.vue
+++ b/src/modules/05_placement/components/probation/ProbationDetail.vue
@@ -61,110 +61,110 @@
 		<div class="row q-col-gutter-sm">
 			<div class="row col-12 q-col-gutter-sm">
 				<div>
-					<q-btn @click="router.push(`/probation/work/add`)" size="12px" flat round color="add" icon="mdi-plus">
-						<q-tooltip>เพิ่มงานที่ได้รับมอบหมาย</q-tooltip>
-					</q-btn>
-				</div>
-				<q-space />
-				<q-input
-					class="col-xs-12 col-sm-3 col-md-2"
-					standout
-					dense
-					v-model="filterKeyword"
-					ref="filterRef"
-					outlined
-					debounce="300"
-					placeholder="ค้นหา"
-				>
-					<template v-slot:append>
-						<q-icon v-if="filterKeyword == ''" name="search" />
-						<q-icon
-							v-if="filterKeyword !== ''"
-							name="clear"
-							class="cursor-pointer"
-							@click="resetFilter"
-						/>
-					</template>
-				</q-input>
+										<q-btn @click="router.push(`/probation/add`)" size="12px" flat round color="add" icon="mdi-plus">
+										<q-tooltip>เพิ่มงานที่ได้รับมอบหมาย</q-tooltip>
+									</q-btn>
+								</div>
+								<q-space />
+								<q-input
+									class="col-xs-12 col-sm-3 col-md-2"
+									standout
+									dense
+									v-model="filterKeyword"
+									ref="filterRef"
+									outlined
+									debounce="300"
+									placeholder="ค้นหา"
+								>
+									<template v-slot:append>
+										<q-icon v-if="filterKeyword == ''" name="search" />
+										<q-icon
+											v-if="filterKeyword !== ''"
+											name="clear"
+											class="cursor-pointer"
+											@click="resetFilter"
+										/>
+									</template>
+								</q-input>
 
-				<q-select
-					v-model="visibleColumns"
-					multiple
-					outlined
-					dense
-					options-dense
-					:display-value="$q.lang.table.columns"
-					emit-value
-					map-options
-					:options="columns"
-					option-value="name"
-					options-cover
-					style="min-width: 150px"
-					class="col-xs-12 col-sm-3 col-md-2"
-				/>
-			</div>
-			<div class="col-12">
-				<q-table
-					ref="table"
-					:columns="columns"
-					:rows="rows"
-					:filter="filterKeyword"
-					row-key="Order"
-					flat
-					bordered
-					:paging="true"
-					dense
-					class="custom-header-table"
-					v-bind="attrs"
-					:visible-columns="visibleColumns"
-					:pagination-label="paginationLabel"
-					v-model:pagination="pagination"
-				>
-					<template v-slot:header="props">
-						<q-tr :props="props">
-							<q-th v-for="col in props.cols" :key="col.name" :props="props">
-								<span class="text-weight-medium">{{ col.label }}</span>
-							</q-th>
-							<q-th auto-width />
-						</q-tr>
-					</template>
-					<template v-slot:body="props">
-						<q-tr :props="props" class="cursor-pointer" @click="router.push(`/probation/form`)">
-							<q-td
-								v-for="col in props.cols"
-								:key="col.name"
-								:props="props"
-							>
-								<div v-if="col.name == 'no'">
-									{{ props.rowIndex + 1 }}
-								</div>
-								<div v-else>
-									{{ col.value }}
-								</div>
-							</q-td>
-							<q-td auto-width>
+								<q-select
+									v-model="visibleColumns"
+									multiple
+									outlined
+									dense
+									options-dense
+									:display-value="$q.lang.table.columns"
+									emit-value
+									map-options
+									:options="columns"
+									option-value="name"
+									options-cover
+									style="min-width: 150px"
+									class="col-xs-12 col-sm-3 col-md-2"
+								/>
+							</div>
+							<div class="col-12">
+								<q-table
+									ref="table"
+									:columns="columns"
+									:rows="rows"
+									:filter="filterKeyword"
+									row-key="Order"
+									flat
+									bordered
+									:paging="true"
+									dense
+									class="custom-header-table"
+									v-bind="attrs"
+									:visible-columns="visibleColumns"
+									:pagination-label="paginationLabel"
+									v-model:pagination="pagination"
+								>
+									<template v-slot:header="props">
+										<q-tr :props="props">
+											<q-th v-for="col in props.cols" :key="col.name" :props="props">
+												<span class="text-weight-medium">{{ col.label }}</span>
+											</q-th>
+											<q-th auto-width />
+										</q-tr>
+									</template>
+									<template v-slot:body="props">
+										<q-tr :props="props" class="cursor-pointer" @click="router.push(`/probation/form`)">
+											<q-td
+												v-for="col in props.cols"
+												:key="col.name"
+												:props="props"
+											>
+												<div v-if="col.name == 'no'">
+													{{ props.rowIndex + 1 }}
+												</div>
+												<div v-else>
+													{{ col.value }}
+												</div>
+											</q-td>
+											<!-- <q-td auto-width>
 								<q-btn flat dense size="12px" round color="blue" icon="mdi-file-download-outline">
 									<q-tooltip> ดาวน์โหลด .Docx</q-tooltip>
 								</q-btn>
-							</q-td>
-						</q-tr>
-					</template>
-					<template v-slot:pagination="scope">
-						<q-pagination
-							v-model="pagination.page"
-							active-color="primary"
-							color="dark"
-							:max="scope.pagesNumber"
-							:max-pages="5"
-							size="sm"
-							boundary-links
-							direction-links
-						></q-pagination>
-					</template>
-				</q-table>
-			</div>
-		</div>   
-  </q-card>    
+							</q-td> -->
+									</q-tr>
+								</template>
+								<template v-slot:pagination="scope">
+									<q-pagination
+										v-model="pagination.page"
+										active-color="primary"
+										color="dark"
+										:max="scope.pagesNumber"
+										:max-pages="5"
+										size="sm"
+										boundary-links
+										direction-links
+									></q-pagination>
+								</template>
+							</q-table>
+						</div>
+					</div>   
+			  </q-card>    
 </template>
 <script setup lang="ts">
 import { useRouter } from "vue-router";
@@ -180,92 +180,92 @@ const institution = ref<string>('ฝ่ายบริหารงานทั
 const status = ref<string>('อยู่ระหว่างการทดลองงาน')
 
 const pagination = ref({
-  sortBy: "desc",
-  descending: false,
-  page: 1,
-  rowsPerPage: 10,
+	sortBy: "desc",
+	descending: false,
+	page: 1,
+	rowsPerPage: 10,
 });
 
 const visibleColumns = ref<string[]>([
-  "no",
-  "startDate",
+	"no",
+	"startDate",
 	"endDete",
-  "intendant",
-  "commander",
+	"intendant",
+	"commander",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 
 // หัวตาราง
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: true,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "startDate",
-    align: "left",
-    label: "ตั้งแต่วันที่",
-    sortable: true,
-    field: "startDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 	{
-    name: "endDete",
-    align: "left",
-    label: "ถึงวันที่",
-    sortable: true,
-    field: "endDete",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+		name: "no",
+		align: "left",
+		label: "ลำดับ",
+		sortable: true,
+		field: "no",
+		headerStyle: "font-size: 14px",
+		style: "font-size: 14px",
+	},
 	{
-    name: "intendant",
-    align: "left",
-    label: "ผู้ดูแล",
-    sortable: true,
-    field: "intendant",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+		name: "startDate",
+		align: "left",
+		label: "ตั้งแต่วันที่",
+		sortable: true,
+		field: "startDate",
+		headerStyle: "font-size: 14px",
+		style: "font-size: 14px",
+	},
 	{
-    name: "commander",
-    align: "left",
-    label: "ผู้บังคับบัญชา",
-    sortable: true,
-    field: "commander",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  }
+		name: "endDete",
+		align: "left",
+		label: "ถึงวันที่",
+		sortable: true,
+		field: "endDete",
+		headerStyle: "font-size: 14px",
+		style: "font-size: 14px",
+	},
+	{
+		name: "intendant",
+		align: "left",
+		label: "ผู้ดูแล",
+		sortable: true,
+		field: "intendant",
+		headerStyle: "font-size: 14px",
+		style: "font-size: 14px",
+	},
+	{
+		name: "commander",
+		align: "left",
+		label: "ผู้บังคับบัญชา",
+		sortable: true,
+		field: "commander",
+		headerStyle: "font-size: 14px",
+		style: "font-size: 14px",
+	}
 ]);
 
 // ข้อมูลตาราง (จำลอง)
 const rows = ref<FormProbationDetail[]>([
-  {
+	{
 		no: "1",
 		startDate: "09 ก.ย. 2566",
 		endDete: "20 ต.ค. 2566",
-  	intendant: "นางสาวรัชภรณ์ ภักดี",
-  	commander: "นายนภัทร  วันดี"
+		intendant: "นางสาวรัชภรณ์ ภักดี",
+		commander: "นายนภัทร  วันดี"
 	},
 	{
 		no: "2",
-		startDate: "09 ก.ย. 2566",
-		endDete: "20 ต.ค. 2566",
-  	intendant: "นางสาวทวิดา กมลเวชชี",
-  	commander: "นางพิศ โพธิ์ดำ"
-	},
-	{
-		no: "3",
-		startDate: "09 ก.ย. 2566",
-		endDete: "20 ต.ค. 2566",
-  	intendant: "นางสาวทวิดา กมลเวชชี",
-  	commander: "นายนภัทร  วันดี"
+		startDate: "25 ต.ค. 2566",
+		endDete: "24 ม.ค. 2567",
+		intendant: "นางสาวทวิดา กมลเวชชี",
+		commander: "นางพิศ โพธิ์ดำ"
 	},
+	// {
+	// 	no: "3",
+	// 	startDate: "09 ก.ย. 2566",
+	// 	endDete: "20 ต.ค. 2566",
+	// intendant: "นางสาวทวิดา กมลเวชชี",
+	// commander: "นายนภัทร  วันดี"
+	// },
 ]);
 
 const clickAdd = () => {
diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts
index 56d987742..9dc852eb9 100644
--- a/src/modules/05_placement/router.ts
+++ b/src/modules/05_placement/router.ts
@@ -20,17 +20,20 @@ const detailOrderReplace = () =>
   import(
     "@/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue"
   );
+
+  // ระบบทดลองงาน
 const mainProbation = () =>
   import("@/modules/05_placement/components/probation/MainProbation.vue");
 
 const probationDetail = () =>
   import("@/modules/05_placement/components/probation/ProbationDetail.vue");
 
-const probationForm = () =>
+const probationFormEvaluation = () =>
   import("@/modules/05_placement/components/probation/MainDetail.vue");
 
 const probationWorkAdd = () =>
   import("@/modules/05_placement/components/probation/MainDetail.vue");
+<<<<<<< HEAD
   const probationWorkAdd2 = () =>
   import("@/modules/05_placement/components/probation/AddWork.vue");
 
@@ -43,117 +46,147 @@ export default [
       Auth: true,
       Key: [6.1],
       Role: "placement",
+=======
+  const probationFormAssign = () =>
+    import("@/modules/05_placement/components/probation/FormAssign.vue");
+  const resignOrder = () =>
+    import("@/modules/05_placement/components/OrderPlacement/ResignOrder.vue");
+  export default [
+    {
+      path: "/placement",
+      name: "placement",
+      component: PlacementMain,
+      meta: {
+        Auth: true,
+        Key: [6.1],
+        Role: "placement",
+      },
+>>>>>>> develop
     },
-  },
-  {
-    path: "/placement/personal-list/:examId",
-    name: "placementDetail",
-    component: PlacementDetail,
-    meta: {
-      Auth: true,
-      Key: [6.1],
-      Role: "placement",
+    {
+      path: "/placement/personal-list/:examId",
+      name: "placementDetail",
+      component: PlacementDetail,
+      meta: {
+        Auth: true,
+        Key: [6.1],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/placement/personal-detail/:personalId",
-    name: "PlacementPersonalDetail",
-    component: PlacementPersonalDetail,
-    meta: {
-      Auth: true,
-      Key: [6.1],
-      Role: "placement",
+    {
+      path: "/placement/personal-detail/:personalId",
+      name: "PlacementPersonalDetail",
+      component: PlacementPersonalDetail,
+      meta: {
+        Auth: true,
+        Key: [6.1],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/placement/order",
-    name: "Orderplacement",
-    component: MainOrderPlacement,
-    meta: {
-      Auth: true,
-      Key: [6.2],
-      Role: "placement",
+    {
+      path: "/placement/order",
+      name: "Orderplacement",
+      component: MainOrderPlacement,
+      meta: {
+        Auth: true,
+        Key: [6.2],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/placement/order/detail",
-    name: "OrderplacementDetail",
-    component: detailOrderReplace,
-    meta: {
-      Auth: true,
-      Key: [6.2],
-      Role: "placement",
+    {
+      path: "/placement/order/detail",
+      name: "OrderplacementDetail",
+      component: detailOrderReplace,
+      meta: {
+        Auth: true,
+        Key: [6.2],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/placement/addOrderPlacement",
-    name: "addOrderPlacement",
-    component: addOrderPlacement,
-    meta: {
-      Auth: true,
-      Key: [6.2],
-      Role: "placement",
+    {
+      path: "/placement/addOrderPlacement",
+      name: "addOrderPlacement",
+      component: addOrderPlacement,
+      meta: {
+        Auth: true,
+        Key: [6.2],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation",
-    name: "probation",
-    component: mainProbation,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation",
+      name: "probation",
+      component: mainProbation,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation/detail/:id",
-    name: "probationDetail",
-    component: probationDetail,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation/detail/:id",
+      name: "probationDetail",
+      component: probationDetail,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation/form",
-    name: "probationForm",
-    component: probationForm,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation/form",
+      name: "probationForm",
+      component: probationFormEvaluation,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation/work/add",
-    name: "probationWorkAdd",
-    component: probationWorkAdd,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation/work/add",
+      name: "probationWorkAdd",
+      component: probationWorkAdd,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation/work/:id",
-    name: "probationWork",
-    component: probationWorkAdd,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation/work/:id",
+      name: "probationWork",
+      component: probationWorkAdd,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
-  },
-  {
-    path: "/probation/add",
-    name: "probationWorkAdd",
-    component: probationWorkAdd2,
-    meta: {
-      Auth: true,
-      Key: [6.3],
-      Role: "placement",
+    {
+      path: "/probation/add",
+      name: "probationWorkAdd",
+      component: probationFormAssign,
+      meta: {
+        Auth: true,
+        Key: [6.3],
+        Role: "placement",
+      },
     },
+<<<<<<< HEAD
   },  
 
 ];
+=======
+    {
+      path: "/placement/resign-order",
+      name: "ResignOrderplacement",
+      component: resignOrder,
+      meta: {
+        Auth: true,
+        Key: [6.2],
+        Role: "placement",
+      },
+    },
+  ];
+>>>>>>> develop