diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index ee5f7079f..cec7c0c36 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(() => {});
     }
   });
 };
@@ -442,8 +442,8 @@ const validateData = async () => {
 };
 
 const clickCloseSendModal = () => {
-  modaladdlist.value = false
-}
+  modaladdlist.value = false;
+};
 
 const clickClose = async () => {
   userNote.value = "";
@@ -556,235 +556,426 @@ 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>
-                  </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"
+      :displayAdd="displayAdd"
+    >
+      <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>
-              </template>
-              <template v-else-if="col.name === 'examNumber'">
-                <div class="text-weight-medium">
-                  {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
-                </div>
-              </template>
+              </div>
+            </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 v-else>
-                  <div class="col-4">
-                    <div class="text-weight-medium">-</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>
-
-    <!-- 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>
+              <div v-else>
+                <div class="col-4">
+                  <div class="text-weight-medium">-</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>
 
-    <!-- dialog เพิ่มรายชื่อ -->
-    <q-dialog v-model="modaladdlist">
-      <q-card style="width: 900px; max-width: 80vw">
-        <DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
+                  <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-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>
+        <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>
 
-          <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">
+  <!-- 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-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-checkbox
               keep-color
               color="primary"
@@ -792,112 +983,153 @@ 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 }}
-                        </div>
+          <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>
-                  </template>
-                  <template v-else-if="col.name === 'examNumber'">
-                    <div class="text-weight-medium">
-                      {{
-                        props.row.examNumber !== null ? props.row.examNumber : "-"
-                      }}
-                    </div>
-                  </template>
+                  </div>
+                </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 v-else>
-                      <div class="col-4">
-                        <div class="text-weight-medium">-</div>
-                      </div>
+                  </div>
+                  <div v-else>
+                    <div class="col-4">
+                      <div class="text-weight-medium">-</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>
+                  </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>
 
-        <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn label="บันทึก" @click="savelist" :disable="checkSelected" color="public" />
+      <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/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index bc2ae3219..4651eeaff 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -29,6 +29,16 @@ export default [
       Role: "retirement",
     },
   },
+  {
+    path: "/retirement/list/:id",
+    name: "retirement/list",
+    component: Listretirement,
+    meta: {
+      Auth: true,
+      Key: [7.1],
+      Role: "retirement",
+    },
+  },
   {
     path: "/retirement/resign",
     name: "resign",
@@ -69,5 +79,5 @@ export default [
       Role: "retirement",
     },
   },
-  
+
 ];