diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index eb0af9051..fab4abd09 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -24,12 +24,18 @@ export default {
 
   // RetirementResign ระบบลาออก
   listResign: () => `${retirement}/resign`,
+  listResignEMP: () => `${retirement}/resign-employee`,
   resignReport: `${retirement}/resign/report`,
   resingByid: (id: string) => `${retirement}/resign/${id}`,
+  resingByidEMP: (id: string) => `${retirement}/resign-employee/${id}`,
   resignConfirm: (role: String, id: string) =>
     `${retirement}/resign/${role}/confirm/${id}`,
+  resignConfirmEMP: (role: String, id: string) =>
+    `${retirement}/resign-employee/${role}/confirm/${id}`,
   resignReject: (role: String, id: string) =>
     `${retirement}/resign/${role}/reject/${id}`,
+  resignRejectEMP: (role: String, id: string) =>
+    `${retirement}/resign-employee/${role}/reject/${id}`,
   listExitInterview: () => `${retirement}/resign/questionnaire`,
   commentExitInterview: (id: string) =>
     `${retirement}/resign/questionnaire/comment/${id}`,
@@ -39,6 +45,8 @@ export default {
   AppointInterview: (id: string) =>
     `${retirement}/resign/questionnaire/appoint/${id}`,
   resignConditions: (id: string) => `${retirement}/resign/debt/${id}`,
+  resignConditionsEMP: (id: string) =>
+    `${retirement}/resign-employee/debt/${id}`,
 
   // ปลดออก
   retirementDischarge,
diff --git a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
new file mode 100644
index 000000000..76156f5eb
--- /dev/null
+++ b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
@@ -0,0 +1,285 @@
+<script setup lang="ts">
+import { ref, watchEffect, computed } from "vue";
+import { useQuasar } from "quasar";
+
+import { useCounterMixin } from "@/stores/mixin";
+import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
+
+import type { PropType } from "vue";
+import type { QTableProps } from "quasar";
+import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
+
+/** use */
+const $q = useQuasar();
+const stroe = useRetirementDataStore();
+const { statusText } = stroe;
+const selected = ref<ResponseItems[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+    remarkHorizontal: i.remarkHorizontal,
+  }));
+});
+const mixin = useCounterMixin();
+const { dialogConfirm, date2Thai } = mixin;
+
+/** props*/
+const props = defineProps({
+  modal: { type: Boolean, requreid: true },
+  closeModal: { type: Function, requreid: true },
+  fecthList: { type: Function, requreid: true },
+  rows: { type: Array as PropType<ResponseItems[]>, requreid: true },
+  filterKeyword2: { type: String, requreid: true },
+  mainTabs: { type: String, requreid: true },
+});
+
+//Table
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: (row) => props?.rows!.indexOf(row) + 1,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "fullname",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: (row) => `${row.prefix}${row.firstName} ${row.lastName}`,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "location",
+    align: "left",
+    label: "สถานที่ยื่นขอลาออกจากราชการ",
+    sortable: true,
+    field: "location",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "กลุ่มงาน",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organizationPositionOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationPositionOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "datetext",
+    align: "left",
+    label: "วันที่ยื่น",
+    sortable: true,
+    field: (row) => date2Thai(new Date(row.createdAt)),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sortOrder: "da",
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: (row) => statusText(row.status),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "prefix",
+  "fullname",
+  "location",
+  "positionLevel",
+  "positionNumberOld",
+  "organizationPositionOld",
+  "datetext",
+  "status",
+]);
+
+const modalCommand = ref<boolean>(false);
+
+/** popup ยืนยันส่งัว */
+function saveOrder() {
+  dialogConfirm(
+    $q,
+    () => {
+      props.closeModal?.();
+      modalCommand.value = true;
+    },
+    "ยืนยันส่งไปออกคำสั่ง",
+    "ต้องการยืนยันส่งไปออกคำสั่งใช่หรือไม่?"
+  );
+}
+
+const emit = defineEmits(["update:filterKeyword2", "update:selected"]);
+function updateInput(value: any) {
+  emit("update:filterKeyword2", value);
+}
+
+/** รีเซ็ตค่าในช่องค้นหา */
+function Reset() {
+  emit("update:filterKeyword2", "");
+}
+
+watchEffect(() => {
+  if (props.modal === true) {
+    selected.value = [];
+  }
+});
+</script>
+<template>
+  <q-dialog v-model="props.modal">
+    <q-card style="width: 1200px; max-width: 80vw">
+      <DialogHeader tittle="ส่งไปออกคำสั่งลาออก" :close="closeModal" />
+      <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"
+                :model-value="filterKeyword2"
+                @update:model-value="updateInput"
+                placeholder="ค้นหา"
+                style="width: 850px; max-width: auto"
+              >
+                <template v-slot:append>
+                  <q-icon v-if="filterKeyword2 == ''" name="search" />
+                  <q-icon
+                    v-if="filterKeyword2 !== ''"
+                    name="clear"
+                    class="cursor-pointer"
+                    @click="Reset"
+                  />
+                </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"
+                style="min-width: 140px"
+                class="gt-xs q-ml-sm"
+              />
+            </q-toolbar>
+          </div>
+        </div>
+
+        <d-table
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword2"
+          row-key="id"
+          :visible-columns="visibleColumns"
+          selection="multiple"
+          v-model:selected="selected"
+        >
+          <template v-slot:header-selection="scope">
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
+          </template>
+
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td>
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="props.selected"
+                />
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div
+                  :class="
+                    col.name === 'organizationPositionOld' ||
+                    col.name === 'organization'
+                      ? 'table_ellipsis2'
+                      : ''
+                  "
+                >
+                  {{ col.value ? col.value : "" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </q-card-section>
+
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn
+          label="ส่งไปออกคำสั่ง"
+          @click="saveOrder"
+          :disable="selected.length === 0"
+          color="public"
+        />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
+  <DialogCreateCommand
+    v-model:modal="modalCommand"
+    :command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
+    :persons="dataMapToSend"
+  />
+</template>
diff --git a/src/modules/06_retirement/components/resignEMP/Main.vue b/src/modules/06_retirement/components/resignEMP/Main.vue
new file mode 100644
index 000000000..dd0d26dc0
--- /dev/null
+++ b/src/modules/06_retirement/components/resignEMP/Main.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { useDataStore } from "@/modules/06_retirement/store/resignMain";
+
+import Table from "@/modules/06_retirement/components/resignEMP/Table.vue";
+
+const stroe = useDataStore();
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">รายการลาออกลูกจ้าง</div>
+  <div>
+    <q-card flat bordered class="col-12">
+      <q-tabs
+        v-model="stroe.mainTabsEMP"
+        dense
+        align="left"
+        inline-label
+        class="rounded-borders"
+        indicator-color="primary"
+        active-bg-color="teal-1"
+        active-class="text-primary"
+      >
+        <q-tab name="1" label="ขอลาออก" />
+        <q-tab name="2" label="ขอยกเลิกลาออก" />
+      </q-tabs>
+      <q-separator />
+      <div>
+        <q-tab-panels v-model="stroe.mainTabsEMP" animated>
+          <q-tab-panel name="1"> <Table /> </q-tab-panel>
+
+          <q-tab-panel name="2"> <Table /> </q-tab-panel>
+        </q-tab-panels>
+      </div>
+    </q-card>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/06_retirement/components/resignEMP/ResignByid.vue b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
new file mode 100644
index 000000000..c5668d966
--- /dev/null
+++ b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
@@ -0,0 +1,1434 @@
+<script setup lang="ts">
+import { ref, onMounted, computed } from "vue";
+import axios from "axios";
+import { useRouter, useRoute } from "vue-router";
+import { useQuasar, QForm } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import genReport from "@/plugins/genreport";
+import { useCounterMixin } from "@/stores/mixin";
+import DialogHeader from "@/components/DialogHeader.vue";
+
+import type {
+  TypeFile,
+  rowFile,
+  FileList,
+} from "@/modules/06_retirement/interface/response/Main";
+import type { QTableProps } from "quasar";
+import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
+
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+import CardProfile from "@/components/CardProfile.vue";
+import WorkFlow from "@/components/Workflow/Main.vue";
+
+/** Use */
+const $q = useQuasar();
+const route = useRoute();
+const router = useRouter();
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailbyid");
+const mixin = useCounterMixin();
+const {
+  messageError,
+  date2Thai,
+  showLoader,
+  hideLoader,
+  success,
+
+  dialogConfirm,
+  dialogRemove,
+} = mixin;
+
+/** ตัวแปร */
+const modalPersonal = ref<boolean>(false);
+const personId = ref<string>("");
+const roleUser = ref<string>("");
+const dataProfile = ref<DataProfile>();
+
+const id = ref<string>(route.params.id.toString());
+const myForm = ref<QForm | null>(null);
+const edit = ref<boolean>(false);
+const conditions = ref<boolean>(false);
+const dataDetail = ref<any>({
+  datetext: "",
+  activeDate: new Date(),
+  createdAt: new Date(),
+  firstName: "",
+  id: "",
+  isActive: true,
+  lastName: "",
+  location: "",
+  organizationPositionOld: "",
+  positionLevelOld: "",
+  positionNumberOld: "",
+  positionTypeOld: "",
+  prefix: "",
+  profileId: "",
+  reason: "",
+  salary: 0,
+  sendDate: new Date(),
+  status: "",
+  statustext: "",
+  fullname: "",
+});
+
+const workflowRef = ref<any>(null);
+const organizationPositionOld = ref<string>("");
+const positionTypeOld = ref<string>("");
+const positionLevelOld = ref<string>("");
+const posNo = ref<string>("");
+const salary = ref<number>(0);
+const date = ref<Date | null>(null);
+const dateLeave = ref<Date | null>(null);
+const reason = ref<string>("");
+const location = ref<string>("");
+const status = ref<string>("");
+const remarkHorizontal = ref<string>("");
+const modal = ref<boolean>(false);
+const actionPass = ref<boolean>(false);
+const reasonReign = ref<string>("");
+const dateBreak = ref<Date | null>(null);
+
+const isCheckData = computed(() => {
+  if (
+    organizationPositionOld.value !== "" &&
+    positionTypeOld.value !== "" &&
+    positionLevelOld.value !== "" &&
+    posNo.value !== "" &&
+    salary.value !== 0 &&
+    date.value !== null &&
+    dataDetail.value.commanderReject !== null &&
+    dataDetail.value.oligarchReject !== null
+  ) {
+    return true;
+  } else return false;
+});
+
+/** คอลัมน์ */
+const rows = ref<TypeFile[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: true,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fileName",
+    align: "left",
+    label: "ชื่อไฟล์",
+    sortable: true,
+    field: "fileName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "btnMicrosoft",
+    align: "right",
+    label: "ปุ่ม",
+    sortable: true,
+    field: "btnMicrosoft",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+/**เปิด-ปิด modal */
+function closeModal() {
+  modal.value = false;
+}
+function openModal() {
+  modal.value = true;
+}
+
+const file = ref<any>(null);
+const fileList = ref<FileList[]>([]);
+const isNoDebt = ref<boolean>(false);
+const isNoBurden = ref<boolean>(false);
+const isDiscipline = ref<boolean>(false);
+
+// เอกสารดาวน์โหลด
+const rowsFileDownload = ref<rowFile[]>([
+  {
+    fileName: "แบบฟอร์มหนังสือขอลาออกจากราชการ",
+    pathName: "",
+  },
+]);
+
+function diffDate() {
+  if (date.value !== null && dateLeave.value !== null) {
+    const time = dateLeave.value.getTime() - date.value.getTime();
+    //วันที่ขอลาออกจากราชการ - วันที่ยื่นขอลาออกจากราชการ
+    const day = time / (1000 * 3600 * 24);
+    if (day < 30) {
+      return true;
+    }
+    return false;
+  }
+  return false;
+}
+
+/** นำข้อมูลมาจาก API*/
+async function fetchData(id: string) {
+  showLoader();
+  await http
+    .get(config.API.resingByidEMP(id))
+    .then(async (res) => {
+      const data = await res.data.result;
+      dataProfile.value = data as DataProfile;
+
+      let list: TypeFile[] = [];
+      if (data.docs.length > 0) {
+        data.docs.map((doc: TypeFile) => {
+          list.push({
+            pathName: doc.pathName ?? "",
+            fileName: doc.fileName ?? "",
+          });
+        });
+      }
+      rows.value = list;
+      dataDetail.value = data;
+
+      organizationPositionOld.value = data.organizationPositionOld ?? "";
+      positionTypeOld.value = data.positionTypeOld ?? "";
+      positionLevelOld.value = data.positionLevelOld ?? "";
+      posNo.value = data.positionNumberOld ?? "";
+      salary.value = data.salary ? data.salary : 0;
+      date.value = data.sendDate ? new Date(data.sendDate) : null;
+      dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
+      reason.value = data.reason ?? "";
+      location.value = data.location ?? "";
+      status.value = data.status ?? "";
+      remarkHorizontal.value = data.remarkHorizontal ?? "-";
+      isNoDebt.value = data.isNoDebt;
+      isNoBurden.value = data.isNoBurden;
+      isDiscipline.value = data.isDiscipline;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**Pop up */
+function popUp(action: "pass" | "passNot", type: string) {
+  reasonReign.value = "";
+  dateBreak.value = null;
+  actionPass.value = action === "pass";
+  roleUser.value = type;
+  openModal();
+}
+
+//เงื่อนไขpop up
+function onSubmit() {
+  if (actionPass.value) {
+    confirmpopUp();
+  } else {
+    rejectpopUp();
+  }
+}
+
+//pop up ยืนยันการอนุญาต
+async function confirmpopUp() {
+  dialogConfirm(
+    $q,
+    async () => {
+      showLoader();
+      const body = {
+        reason: reasonReign.value,
+      };
+      await http
+        .put(config.API.resignConfirmEMP(roleUser.value, id.value), body)
+        .then(async () => {
+          await fetchData(id.value);
+          closeModal();
+          success($q, "การอนุญาตสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
+    "ยืนยันการอนุญาต",
+    "ต้องการยืนยันการอนุญาตการลานี้หรือไม่ ?"
+  );
+}
+
+//pop up การยับยั้งสำเร็จ
+async function rejectpopUp() {
+  dialogConfirm(
+    $q,
+    async () => {
+      showLoader();
+      const body = {
+        reason: reasonReign.value,
+        date: dateBreak.value,
+      };
+      await http
+        .put(config.API.resignRejectEMP(roleUser.value, id.value), body)
+        .then(async () => {
+          await fetchData(id.value);
+          closeModal();
+          success($q, "การยับยั้งสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
+    "ยืนยันการยับยั้ง",
+    "ต้องการยืนยันการยับยั้งนี้หรือไม่ ?"
+  );
+}
+
+/**
+ * กดยกเลิก
+ */
+async function clickCancel() {
+  await fetchData(id.value);
+  edit.value = false;
+  myForm.value?.resetValidation();
+}
+/**
+ * กดยกเลิก
+ */
+async function clickCancelConditions() {
+  await fetchData(id.value);
+  conditions.value = false;
+}
+
+/** Function บันทึก รายการตรวจสอบเงื่อนไขต่าง ๆ*/
+function onSubmitConditions() {
+  dialogConfirm($q, () => {
+    showLoader();
+    http
+      .put(config.API.resignConditionsEMP(id.value), {
+        isNoDebt: isNoDebt.value,
+        isNoBurden: isNoBurden.value,
+        isDiscipline: isDiscipline.value,
+      })
+      .then(async () => {
+        await fetchData(id.value);
+        success($q, "บันทึกเงื่อนไขต่าง ๆ สำเร็จ");
+        conditions.value = false;
+      })
+      .catch((err) => {
+        messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  });
+}
+
+/** Function บันทึก ,แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย*/
+function onSubmitAttached() {
+  dialogConfirm($q, () => {
+    const formData = new FormData();
+    const send = date.value !== null ? new Date(date.value).toUTCString() : "";
+    const activeDate =
+      dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
+    formData.append("Location", location.value);
+    formData.append("SendDate", send);
+    formData.append("ActiveDate", activeDate);
+    formData.append("Reason", reason.value);
+    formData.append("OrganizationPositionOld", organizationPositionOld.value);
+    formData.append("PositionTypeOld", positionTypeOld.value);
+    formData.append("PositionLevelOld", positionLevelOld.value);
+    formData.append("PositionNumberOld", posNo.value);
+    formData.append("AmountOld", salary.value.toString());
+    formData.append("remarkHorizontal", remarkHorizontal.value);
+    showLoader();
+    http
+      .put(config.API.resingByidEMP(id.value), formData)
+      .then(async () => {
+        await fetchData(id.value);
+        success($q, "บันทึกข้อมูลสำเร็จ");
+        edit.value = false;
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  });
+}
+
+/**
+ * Function เพิ่ม Class เวลา Edit
+ * @param val เมื่อเป็นEdit จะเปลี่ยน Class
+ */
+function getClass(val: boolean) {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+}
+
+/** แปลง StatusOrder */
+function statusOrder(val: boolean) {
+  switch (val) {
+    case true:
+      return "ยับยั้ง";
+    case false:
+      return "อนุญาต";
+  }
+}
+
+// ดาว์นโหลดไฟล์
+async function fileDownload(type: string, fileName: string) {
+  showLoader();
+  await http
+    .get(config.API.reportResignList(type, id.value))
+    .then(async (res) => {
+      const data = res.data.result;
+      await genReport(data, `${fileName}`, type);
+    })
+    .catch(async (e) => {
+      messageError($q, JSON.parse(await e.response.data.text()));
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function updatemodalPersonal(modal: boolean) {
+  modalPersonal.value = modal;
+}
+
+async function fetchFile() {
+  showLoader();
+  await http
+    .get(config.API.file("พ้นจากราชการ", "หลักฐานลาออก", id.value))
+    .then(async (res) => {
+      fileList.value = await res.data;
+    })
+    .catch((e) => {
+      messageError($q, e);
+      hideLoader();
+    });
+}
+
+function uploadFiles() {
+  showLoader();
+  http
+    .post(config.API.file("พ้นจากราชการ", "หลักฐานลาออก", id.value), {
+      replace: true,
+      fileList: [
+        {
+          fileName: file.value.name,
+        },
+      ],
+    })
+    .then(async (res) => {
+      const foundKey: string | undefined = Object.keys(res.data).find(
+        (key) =>
+          res.data[key]?.fileName !== undefined &&
+          res.data[key]?.fileName !== ""
+      );
+      foundKey && (await uploadFileURL(res.data[foundKey]?.uploadUrl));
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+async function uploadFileURL(uploadUrl: string) {
+  const Data = new FormData();
+  Data.append("file", file.value);
+  showLoader();
+  await axios
+    .put(uploadUrl, file.value, {
+      headers: {
+        "Content-Type": file.value.type,
+      },
+    })
+    .then(async () => {
+      await fetchFile();
+      success($q, "อัปโหลดไฟล์สำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+      file.value = null;
+    });
+}
+
+async function downloadFiles(fileName: string) {
+  showLoader();
+  await http
+    .get(
+      config.API.fileByFile("พ้นจากราชการ", "หลักฐานลาออก", id.value, fileName)
+    )
+    .then(async (res) => {
+      const data = await res.data.downloadUrl;
+      window.open(data, "_blank");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
+}
+
+/**
+ * ลบไฟล์
+ * @param id id file
+ */
+function removeFile(fileName: string) {
+  dialogRemove($q, () => {
+    showLoader();
+    http
+      .delete(
+        config.API.fileByFile(
+          "พ้นจากราชการ",
+          "หลักฐานลาออก",
+          id.value,
+          fileName
+        )
+      )
+      .then(() => {
+        setTimeout(async () => {
+          await fetchFile();
+          success($q, `ลบไฟล์สำเร็จ`);
+          hideLoader();
+        }, 1000);
+      })
+      .catch((e) => {
+        messageError($q, e);
+        hideLoader();
+      });
+  });
+}
+
+/** Hook */
+onMounted(async () => {
+  showLoader();
+  await Promise.all([fetchData(id.value), fetchFile()]).finally(() => {
+    hideLoader();
+  });
+});
+</script>
+
+<template>
+  <div class="q-gutter-sm q-pa-sm">
+    <div class="toptitle text-dark col-12 row items-center">
+      <q-btn
+        icon="mdi-arrow-left"
+        unelevated
+        round
+        dense
+        flat
+        color="primary"
+        class="q-mr-sm"
+        @click="router.push('/retirement/resign-employee')"
+      />
+      รายละเอียดการลาออกของ
+      {{ dataDetail.firstName + "  " + dataDetail.lastName }}
+    </div>
+
+    <CardProfile :type="'employee'" :data="dataProfile as DataProfile" />
+
+    <!-- ข้อมูลการลาออก -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
+        <!-- <q-space />
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            (roleUser === 'officer' && dataDetail.officerReject === null) ||
+            (roleUser === 'commander' &&
+              dataDetail.commanderReject === null &&
+              dataDetail.officerReject !== null) ||
+            (roleUser === 'oligarch' &&
+              dataDetail.oligarchReject === null &&
+              dataDetail.commanderReject !== null &&
+              dataDetail.officerReject !== null)
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot')"
+          />
+        </div> -->
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">สถานที่ยื่นขอลาออกจากราชการ</div>
+              <div class="col-12 text-detail">{{ dataDetail.location }}</div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">วันที่ยื่นขอลาออกจากราชการ</div>
+              <div class="col-12 text-detail">
+                {{ date2Thai(dataDetail.sendDate) }}
+              </div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">เหตุผลที่ลาออกจากราชการ</div>
+              <div class="col-12 text-detail">{{ dataDetail.reason }}</div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">วันที่ขอลาออกจากราชการ</div>
+              <div
+                :class="
+                  diffDate()
+                    ? 'col-12 text-detail text-red text-bold'
+                    : 'col-12 text-detail'
+                "
+              >
+                {{ date2Thai(dataDetail.activeDate) }}
+              </div>
+              <div
+                :class="
+                  diffDate()
+                    ? 'col-12 text-detail text-red text-bold'
+                    : 'col-12 text-detail'
+                "
+              >
+                {{ diffDate() ? "(ยื่นขอลาออกน้อยกว่า 30 วัน)" : "" }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- เอกสารเพิ่มเติม -->
+    <q-card
+      v-if="rows.length > 0"
+      bordered
+      class="row col-12 text-dark q-mt-sm"
+    >
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">เอกสารเพิ่มเติม</div>
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="col-12">
+        <d-table
+          :rows="rows"
+          :columns="columns"
+          row-key="fileName"
+          hide-header
+          hide-bottom
+        >
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="fileName" :props="props">
+                {{ props.row.fileName }}
+              </q-td>
+              <q-td key="btnMicrosoft" :props="props">
+                <q-btn
+                  type="a"
+                  target="_blank"
+                  :href="props.row.pathName"
+                  flat
+                  dense
+                  round
+                  color="red"
+                  icon="picture_as_pdf"
+                >
+                  <q-tooltip>ไฟล์ PDF</q-tooltip>
+                </q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </div>
+    </q-card>
+
+    <!-- เอกสารดาวน์โหลด -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">เอกสารดาวน์โหลด</div>
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="col-12">
+        <d-table
+          :rows="rowsFileDownload"
+          :columns="columns"
+          row-key="fileName"
+          hide-header
+          hide-bottom
+        >
+          <template v-slot:body="props">
+            <q-tr :props="props" class="cursor-pointer">
+              <q-td key="fileName" :props="props">
+                {{ props.row.fileName }}
+              </q-td>
+              <q-td key="btnMicrosoft" :props="props">
+                <q-btn
+                  flat
+                  dense
+                  round
+                  color="red"
+                  icon="picture_as_pdf"
+                  @click="fileDownload('pdf', props.row.fileName)"
+                >
+                  <q-tooltip>ไฟล์ PDF</q-tooltip>
+                </q-btn>
+                <q-btn
+                  flat
+                  dense
+                  round
+                  color="blue"
+                  icon="mdi-file-word"
+                  @click="fileDownload('docx', props.row.fileName)"
+                >
+                  <q-tooltip>ไฟล์ WORD</q-tooltip>
+                </q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </div>
+    </q-card>
+
+    <!-- รายการตรวจสอบเงื่อนไขต่าง ๆ -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          รายการตรวจสอบเงื่อนไขต่าง ๆ
+        </div>
+      </div>
+
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-sm q-col-gutter-sm">
+        <div class="col-6">
+          <q-card bordered class="row col-12 text-dark q-mt-sm">
+            <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+              <div class="q-pl-sm text-weight-bold text-dark">
+                เงื่อนไขต่าง ๆ
+              </div>
+              <q-space />
+              <!-- && workflowRef?.permission.isUpdate -->
+              <div v-if="!checkRoutePermisson">
+                <div v-if="!conditions">
+                  <q-btn
+                    outline
+                    color="primary"
+                    dense
+                    icon-right="mdi-file-edit-outline"
+                    class="q-px-sm"
+                    label="แก้ไข"
+                    style="width: 80px"
+                    @click="conditions = !conditions"
+                  />
+                </div>
+                <div v-else class="q-gutter-x-sm">
+                  <q-btn
+                    outline
+                    color="public"
+                    dense
+                    class="q-px-sm"
+                    label="บันทึก"
+                    style="width: 80px"
+                    @click="onSubmitConditions"
+                  />
+                  <q-btn
+                    outline
+                    color="red"
+                    dense
+                    class="q-px-sm"
+                    label="ยกเลิก"
+                    style="width: 80px"
+                    @click="clickCancelConditions"
+                  />
+                </div>
+              </div>
+            </div>
+            <div class="col-12"><q-separator /></div>
+            <div class="col-12">
+              <q-checkbox
+                v-model="isNoDebt"
+                label="ไม่เป็นหนี้สหกรณ์"
+                color="teal"
+                :disable="!conditions"
+              />
+            </div>
+            <div class="col-12">
+              <q-checkbox
+                v-model="isNoBurden"
+                label="ไม่มีภาระผูกพันค้ำประกันทุนการศึกษา"
+                color="teal"
+                :disable="!conditions"
+              />
+            </div>
+            <div class="col-12">
+              <q-checkbox
+                v-model="isDiscipline"
+                label="ไม่มีพฤติการณ์ทางวินัย"
+                color="teal"
+                :disable="!conditions"
+              />
+            </div>
+          </q-card>
+        </div>
+        <div class="col-6">
+          <q-card bordered class="row col-12 text-dark q-mt-sm">
+            <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+              <div class="q-pl-sm text-weight-bold text-dark">
+                เอกสารหลักฐานต่าง ๆ
+              </div>
+            </div>
+            <div class="col-12"><q-separator /></div>
+            <div class="row col-12 q-col-gutter-y-sm q-pa-sm">
+              <div class="col-12 row">
+                <!-- && workflowRef?.permission.isUpdate -->
+                <q-file
+                  v-if="!checkRoutePermisson"
+                  class="col-12"
+                  for="#evidenceFiles"
+                  outlined
+                  dense
+                  v-model="file"
+                  label="อัปโหลดเอกสารหลักฐานต่าง ๆ"
+                  hide-bottom-space
+                >
+                  <template v-slot:prepend>
+                    <q-icon name="attach_file" color="primary" />
+                  </template>
+                  <template v-slot:after>
+                    <q-btn
+                      v-if="file"
+                      size="14px"
+                      flat
+                      round
+                      dense
+                      color="add"
+                      icon="mdi-upload"
+                      @click="uploadFiles"
+                      ><q-tooltip>อัปโหลดเอกสาร</q-tooltip></q-btn
+                    >
+                  </template>
+                </q-file>
+              </div>
+
+              <div v-if="fileList.length > 0" class="col-xs-12 row">
+                <q-list class="full-width rounded-borders" bordered separator>
+                  <q-item
+                    v-for="File in fileList"
+                    :key="File.id"
+                    clickable
+                    v-ripple
+                  >
+                    <q-item-section>{{ File.title }}</q-item-section>
+                    <q-item-section avatar>
+                      <div class="row">
+                        <div>
+                          <q-btn
+                            dense
+                            flat
+                            round
+                            size="12px"
+                            color="blue"
+                            icon="mdi-download-outline"
+                            @click="downloadFiles(File.fileName)"
+                          >
+                            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
+                          </q-btn>
+                        </div>
+                        <div>
+                          <q-btn
+                            v-if="
+                              dataDetail.status == 'WAITTING' &&
+                              !checkRoutePermisson
+                            "
+                            dense
+                            flat
+                            round
+                            size="12px"
+                            color="red"
+                            icon="mdi-delete-outline"
+                            @click="removeFile(File.fileName)"
+                            ><q-tooltip>ลบไฟล์</q-tooltip></q-btn
+                          >
+                        </div>
+                      </div>
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </div>
+
+              <div class="col-12" v-else>
+                <q-card class="q-pa-sm" bordered> ไม่มีรายการเอกสาร </q-card>
+              </div>
+            </div>
+          </q-card>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- ผลการพิจารณาของการเจ้าหน้าที่ของหน่วยงาน -->
+    <!-- <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          ผลการพิจารณาของการเจ้าหน้าที่ของหน่วยงาน
+        </div>
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">สถานะ</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.officerReject !== null
+                  ? statusOrder(dataDetail.officerReject)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.officerRejectDate !== null
+                  ? date2Thai(dataDetail.officerRejectDate)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-12 row items-start">
+            <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.officerReject
+                  ? dataDetail.officerRejectReason
+                  : dataDetail.officerApproveReason
+              }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card> -->
+
+    <!-- ผลการพิจารณาของผู้บังคับบัญชา -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          ผลการพิจารณาของผู้บังคับบัญชา
+        </div>
+        <q-space />
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            workflowRef?.permission.isUpdate &&
+            dataDetail.commanderReject === null
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass', 'commander')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot', 'commander')"
+          />
+        </div>
+      </div>
+
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">สถานะ</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderReject !== null
+                  ? statusOrder(dataDetail.commanderReject)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderRejectDate !== null
+                  ? date2Thai(dataDetail.commanderRejectDate)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-12 row items-start">
+            <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderReject
+                  ? dataDetail.commanderRejectReason
+                  : dataDetail.commanderApproveReason
+              }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- ผลการพิจารณาของผู้มีอำนาจ -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          ผลการพิจารณาของผู้มีอำนาจ
+        </div>
+        <q-space />
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            workflowRef?.permission.isUpdate &&
+            dataDetail.oligarchReject === null
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass', 'oligarch')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot', 'oligarch')"
+          />
+        </div>
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">สถานะ</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchReject !== null
+                  ? statusOrder(dataDetail.oligarchReject)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchRejectDate !== null
+                  ? date2Thai(dataDetail.oligarchRejectDate)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <div class="col-xs-12 row items-start">
+            <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchReject
+                  ? dataDetail.oligarchRejectReason
+                  : dataDetail.oligarchApproveReason
+              }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <q-form
+        ref="myForm"
+        greedy
+        @submit.prevent
+        @validation-success="onSubmitAttached"
+      >
+        <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+          <div class="q-pl-sm text-weight-bold text-dark">
+            แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+          </div>
+          <q-space />
+          <!-- && workflowRef?.permission.isUpdate -->
+          <div v-if="!checkRoutePermisson">
+            <div class="q-gutter-sm" v-if="!edit">
+              <q-btn
+                outline
+                color="primary"
+                dense
+                icon-right="mdi-file-edit-outline"
+                class="q-px-sm"
+                label="แก้ไข"
+                style="width: 80px"
+                @click="edit = !edit"
+                v-if="!(status == 'REPORT' || status == 'DONE')"
+              />
+            </div>
+            <div class="q-gutter-sm" v-else>
+              <q-btn
+                outline
+                color="public"
+                dense
+                class="q-px-sm"
+                label="บันทึก"
+                style="width: 80px"
+                type="submit"
+              />
+              <q-btn
+                outline
+                color="red"
+                dense
+                class="q-px-sm"
+                label="ยกเลิก"
+                style="width: 80px"
+                @click="clickCancel"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row col-12 q-pa-md">
+          <div class="col-12 row bg-white q-col-gutter-md">
+            <div class="col-xs-12 row items-center">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="organizationPositionOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัดเดิม'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่ง/สังกัดเดิม'}`"
+                  type="textarea"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionTypeOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่งประเภท'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionLevelOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
+                  hide-bottom-space
+                  :label="`${'ระดับตำแหน่ง'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="posNo"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่'}`]"
+                  hide-bottom-space
+                  :label="`${'เลขที่'}`"
+                />
+              </div>
+            </div>
+            <!-- <div class="col-xs-6 col-sm-3 row">
+              <div class="col-12">
+                <q-input
+                  v-model="salary"
+                  :outlined="edit"
+                  dense
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  hide-bottom-space
+                  :label="`${'เงินเดือน'}`"
+                  :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                  lazy-rules
+                  :class="getClass(edit)"
+                  mask="###,###,###,###"
+                  reverse-fill-mask
+                />
+              </div>
+            </div> -->
+            <div class="col-12"><q-separator /></div>
+            <div class="col-xs-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="location"
+                  :rules="[
+                  (val:string) => !!val || `${'กรุณากรอกสถานที่ยื่นขอลาออกจากราชการ'}`,
+                ]"
+                  hide-bottom-space
+                  :label="`${'สถานที่ยื่นขอลาออกจากราชการ'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-4 row">
+              <div class="col-12">
+                <datepicker
+                  menu-class-name="modalfix"
+                  :readonly="!edit"
+                  v-model="date"
+                  :locale="'th'"
+                  autoApply
+                  :enableTimePicker="false"
+                  week-start="0"
+                >
+                  <template #year="{ year }">{{ year + 543 }}</template>
+                  <template #year-overlay-value="{ value }">{{
+                    parseInt(value + 543)
+                  }}</template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="!edit"
+                      :class="getClass(edit)"
+                      :outlined="edit"
+                      dense
+                      :borderless="!edit"
+                      :model-value="date !== null ? date2Thai(date) : null"
+                      :rules="[
+                      (val:string) =>
+                        !!val || `${'กรุณาเลือก วันที่ยื่นขอลาออกจากราชการ'}`,
+                    ]"
+                      hide-bottom-space
+                      :label="`${' วันที่ยื่นขอลาออกจากราชการ'}`"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          :style="
+                            edit
+                              ? 'color: var(--q-primary)'
+                              : 'color: var(--q-grey)'
+                          "
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+            </div>
+            <div class="col-12">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="reason"
+                :rules="[
+                (val:string) => !!val || `${'กรุณากรอกเหตุผลที่ลาออกจากราชการ'}`,
+              ]"
+                hide-bottom-space
+                :label="`${'เหตุผลที่ลาออกจากราชการ (หมายเหตุแนวตั้ง)'}`"
+                type="textarea"
+              />
+            </div>
+            <div class="col-12">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="remarkHorizontal"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกหมายเหตุแนวนอน '}`]"
+                hide-bottom-space
+                :label="`${'หมายเหตุแนวนอน '}`"
+                type="textarea"
+              />
+            </div>
+          </div>
+        </div>
+      </q-form>
+    </q-card>
+    <!-- <WorkFlow
+      ref="workflowRef"
+      v-model:is-check-data="isCheckData"
+      :id="id"
+      sys-name="SYS_RETIREMENT"
+    /> -->
+  </div>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 800px">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader
+          :tittle="`${actionPass ? 'อนุญาตการลาออก' : 'ยับยั้งการลาออก'}`"
+          :close="closeModal"
+        />
+        <q-separator />
+        <q-card-section class="q-p-sm q-gutter-md">
+          <div class="col-xs-12 col-sm-12 col-md-12">
+            <q-input
+              hide-bottom-space
+              dense
+              outlined
+              lazy-rules
+              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              v-model="reasonReign"
+              :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
+              type="textarea"
+              class="inputgreen"
+            />
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-12" v-if="!actionPass">
+            <datepicker
+              menu-class-name="modalfix"
+              v-model="dateBreak"
+              :locale="'th'"
+              autoApply
+              :enableTimePicker="false"
+              week-start="0"
+            >
+              <template #year="{ year }">{{ year + 543 }}</template>
+              <template #year-overlay-value="{ value }">{{
+                parseInt(value + 543)
+              }}</template>
+              <template #trigger>
+                <q-input
+                  outlined
+                  dense
+                  class="inputgreen"
+                  :model-value="
+                    dateBreak !== null ? date2Thai(dateBreak) : null
+                  "
+                  hide-bottom-space
+                  :label="`${' วันสุดท้ายที่ยับยั้ง'}`"
+                  :rules="[(val:string) => !!val || 'กรุณาเลือกวันที่']"
+                >
+                  <template v-slot:prepend>
+                    <q-icon
+                      name="event"
+                      class="cursor-pointer"
+                      color="primary"
+                      :style="
+                        edit
+                          ? 'color: var(--q-primary)'
+                          : 'color: var(--q-grey)'
+                      "
+                    >
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </datepicker>
+          </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+        <!-- <DialogFooter :editvisible="true" :save="conditionPopup" /> -->
+      </q-form>
+    </q-card>
+  </q-dialog>
+
+  <PopupPersonal
+    :modal="modalPersonal"
+    :id="personId"
+    @update:modal="updatemodalPersonal"
+  />
+</template>
+
+<style lang="scss" scope>
+.q-img {
+  border-radius: 5px;
+  height: 70px;
+}
+.text-top {
+  color: gray;
+  font-weight: 400;
+  padding-bottom: 3px;
+}
+.text-detail {
+  font-weight: 500;
+}
+</style>
diff --git a/src/modules/06_retirement/components/resignEMP/ResignReject.vue b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
new file mode 100644
index 000000000..de0ab338f
--- /dev/null
+++ b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
@@ -0,0 +1,813 @@
+<script setup lang="ts">
+import { ref, onMounted, computed } from "vue";
+import axios from "axios";
+import { useRouter, useRoute } from "vue-router";
+import { useQuasar, QForm } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import genReport from "@/plugins/genreport";
+import { useCounterMixin } from "@/stores/mixin";
+import DialogHeader from "@/components/DialogHeader.vue";
+
+import type {
+  TypeFile,
+  rowFile,
+  FileList,
+} from "@/modules/06_retirement/interface/response/Main";
+import type { QTableProps } from "quasar";
+import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
+
+import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+import CardProfile from "@/components/CardProfile.vue";
+import WorkFlow from "@/components/Workflow/Main.vue";
+
+/** Use */
+const $q = useQuasar();
+const route = useRoute();
+const router = useRouter();
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailReject");
+const mixin = useCounterMixin();
+const {
+  messageError,
+  date2Thai,
+  showLoader,
+  hideLoader,
+  success,
+
+  dialogConfirm,
+  dialogRemove,
+} = mixin;
+
+/** ตัวแปร */
+const roleUser = ref<string>("");
+const dataProfile = ref<DataProfile>();
+
+const id = ref<string>(route.params.id.toString());
+const myForm = ref<QForm | null>(null);
+const edit = ref<boolean>(false);
+const dataDetail = ref<any>({
+  datetext: "",
+  activeDate: new Date(),
+  createdAt: new Date(),
+  firstName: "",
+  id: "",
+  isActive: true,
+  lastName: "",
+  location: "",
+  organizationPositionOld: "",
+  positionLevelOld: "",
+  positionNumberOld: "",
+  positionTypeOld: "",
+  prefix: "",
+  profileId: "",
+  reason: "",
+  salary: 0,
+  sendDate: new Date(),
+  status: "",
+  statustext: "",
+  fullname: "",
+});
+
+const workflowRef = ref<any>(null);
+const organizationPositionOld = ref<string>("");
+const positionTypeOld = ref<string>("");
+const positionLevelOld = ref<string>("");
+const posNo = ref<string>("");
+const salary = ref<number>(0);
+const date = ref<Date | null>(null);
+const dateLeave = ref<Date | null>(null);
+const reason = ref<string>("");
+const location = ref<string>("");
+const status = ref<string>("");
+const remarkHorizontal = ref<string>("");
+const modal = ref<boolean>(false);
+const actionPass = ref<boolean>(false);
+const reasonReign = ref<string>("");
+const dateBreak = ref<Date | null>(null);
+
+const isCheckData = computed(() => {
+  if (
+    organizationPositionOld.value !== "" &&
+    positionTypeOld.value !== "" &&
+    positionLevelOld.value !== "" &&
+    posNo.value !== "" &&
+    salary.value !== 0 &&
+    date.value !== null &&
+    dataDetail.value.commanderReject !== null &&
+    dataDetail.value.oligarchReject !== null
+  ) {
+    return true;
+  } else return false;
+});
+
+/**เปิด-ปิด modal */
+function closeModal() {
+  modal.value = false;
+}
+function openModal() {
+  modal.value = true;
+}
+
+const isNoDebt = ref<boolean>(false);
+const isNoBurden = ref<boolean>(false);
+const isDiscipline = ref<boolean>(false);
+
+function diffDate() {
+  if (date.value !== null && dateLeave.value !== null) {
+    const time = dateLeave.value.getTime() - date.value.getTime();
+    //วันที่ขอลาออกจากราชการ - วันที่ยื่นขอลาออกจากราชการ
+    const day = time / (1000 * 3600 * 24);
+    if (day < 30) {
+      return true;
+    }
+    return false;
+  }
+  return false;
+}
+
+/** นำข้อมูลมาจาก API*/
+async function fetchData(id: string) {
+  showLoader();
+  await http
+    .get(config.API.listResignEMP() + `/cancel/${id}`)
+    .then(async (res) => {
+      const data = await res.data.result;
+      dataProfile.value = data as DataProfile;
+      dataDetail.value = data;
+
+      organizationPositionOld.value = data.organizationPositionOld ?? "";
+      positionTypeOld.value = data.positionTypeOld ?? "";
+      positionLevelOld.value = data.positionLevelOld ?? "";
+      posNo.value = data.positionNumberOld ?? "";
+      salary.value = data.salary ? data.salary : 0;
+      date.value = data.sendDate ? new Date(data.sendDate) : null;
+      dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
+      reason.value = data.reason ?? "";
+      location.value = data.location ?? "";
+      status.value = data.status ?? "";
+      remarkHorizontal.value = data.remarkHorizontal ?? "-";
+      isNoDebt.value = data.isNoDebt;
+      isNoBurden.value = data.isNoBurden;
+      isDiscipline.value = data.isDiscipline;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**Pop up */
+function popUp(action: "pass" | "passNot", type: string) {
+  reasonReign.value = "";
+  dateBreak.value = null;
+  actionPass.value = action === "pass";
+  roleUser.value = type;
+  openModal();
+}
+
+//เงื่อนไขpop up
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    showLoader();
+    const body = {
+      reason: reasonReign.value,
+      reject: !actionPass.value,
+    };
+    await http
+      .put(config.API.resignRejectEMP(`${roleUser.value}-cancel`, id.value), body)
+      .then(async () => {
+        await fetchData(id.value);
+        closeModal();
+        success($q, "บันทึกข้อมูลสำเร็จ");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  });
+}
+
+/**
+ * กดยกเลิก
+ */
+async function clickCancel() {
+  await fetchData(id.value);
+  edit.value = false;
+  myForm.value?.resetValidation();
+}
+
+/** Function บันทึก ,แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย*/
+function onSubmitAttached() {
+  dialogConfirm($q, () => {
+    const formData = new FormData();
+    const send = date.value !== null ? new Date(date.value).toUTCString() : "";
+    const activeDate =
+      dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
+    formData.append("Location", location.value);
+    formData.append("SendDate", send);
+    formData.append("ActiveDate", activeDate);
+    formData.append("Reason", reason.value);
+    formData.append("OrganizationPositionOld", organizationPositionOld.value);
+    formData.append("PositionTypeOld", positionTypeOld.value);
+    formData.append("PositionLevelOld", positionLevelOld.value);
+    formData.append("PositionNumberOld", posNo.value);
+    formData.append("AmountOld", salary.value.toString());
+    formData.append("remarkHorizontal", remarkHorizontal.value);
+    showLoader();
+    http
+      .put(config.API.listResignEMP() + `/update-cancel/${id.value}`, formData)
+      .then(async () => {
+        await fetchData(id.value);
+        success($q, "บันทึกข้อมูลสำเร็จ");
+        edit.value = false;
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  });
+}
+
+/**
+ * Function เพิ่ม Class เวลา Edit
+ * @param val เมื่อเป็นEdit จะเปลี่ยน Class
+ */
+function getClass(val: boolean) {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+}
+
+/** แปลง StatusOrder */
+function statusOrder(val: boolean) {
+  switch (val) {
+    case true:
+      return "ยับยั้ง";
+    case false:
+      return "อนุญาต";
+  }
+}
+
+/** Hook */
+onMounted(async () => {
+  await fetchData(id.value);
+});
+</script>
+
+<template>
+  <div class="q-gutter-sm q-pa-sm">
+    <div class="toptitle text-dark col-12 row items-center">
+      <q-btn
+        icon="mdi-arrow-left"
+        unelevated
+        round
+        dense
+        flat
+        color="primary"
+        class="q-mr-sm"
+        @click="router.push('/retirement/resign-employee')"
+      />
+      รายละเอียดการยกเลิกลาออกของ{{
+        dataDetail.firstName + "  " + dataDetail.lastName
+      }}
+    </div>
+
+    <CardProfile :type="'employee'" :data="dataProfile as DataProfile" />
+
+    <!-- ข้อมูลการลาออก -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
+        <!-- <q-space />
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            (roleUser === 'officer' && dataDetail.officerReject === null) ||
+            (roleUser === 'commander' &&
+              dataDetail.commanderReject === null &&
+              dataDetail.officerReject !== null) ||
+            (roleUser === 'oligarch' &&
+              dataDetail.oligarchReject === null &&
+              dataDetail.commanderReject !== null &&
+              dataDetail.officerReject !== null)
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot')"
+          />
+        </div> -->
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">สถานที่ยื่นขอลาออกจากราชการ</div>
+              <div class="col-12 text-detail">{{ dataDetail.location }}</div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">วันที่ยื่นขอลาออกจากราชการ</div>
+              <div class="col-12 text-detail">
+                {{ date2Thai(dataDetail.sendDate) }}
+              </div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">เหตุผลที่ลาออกจากราชการ</div>
+              <div class="col-12 text-detail">{{ dataDetail.reason }}</div>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-3 row items-start">
+            <div class="col-12">
+              <div class="col-12 text-top">วันที่ขอลาออกจากราชการ</div>
+              <div
+                :class="
+                  diffDate()
+                    ? 'col-12 text-detail text-red text-bold'
+                    : 'col-12 text-detail'
+                "
+              >
+                {{ date2Thai(dataDetail.activeDate) }}
+              </div>
+              <div
+                :class="
+                  diffDate()
+                    ? 'col-12 text-detail text-red text-bold'
+                    : 'col-12 text-detail'
+                "
+              >
+                {{ diffDate() ? "(ยื่นขอลาออกน้อยกว่า 30 วัน)" : "" }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- ผลการพิจารณาของผู้บังคับบัญชา -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          ผลการพิจารณาของผู้บังคับบัญชา
+        </div>
+        <q-space />
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            workflowRef?.permission.isUpdate &&
+            dataDetail.commanderReject === null
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass', 'commander')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot', 'commander')"
+          />
+        </div>
+      </div>
+
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">สถานะ</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderReject !== null
+                  ? statusOrder(dataDetail.commanderReject)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <!-- <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderRejectDate !== null
+                  ? date2Thai(dataDetail.commanderRejectDate)
+                  : "-"
+              }}
+            </div>
+          </div> -->
+          <div class="col-xs-12 row items-start">
+            <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.commanderReject
+                  ? dataDetail.commanderApproveReason
+                  : dataDetail.commanderApproveReason
+              }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- ผลการพิจารณาของผู้มีอำนาจ -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+        <div class="q-pl-sm text-weight-bold text-dark">
+          ผลการพิจารณาของผู้มีอำนาจ
+        </div>
+        <q-space />
+
+        <div
+          class="q-gutter-x-sm"
+          v-if="
+            workflowRef?.permission.isUpdate &&
+            dataDetail.oligarchReject === null
+          "
+        >
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="check"
+            class="q-px-sm"
+            label="อนุญาต"
+            @click="popUp('pass', 'oligarch')"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            icon-right="close"
+            class="q-px-sm"
+            label="ยับยั้ง"
+            @click="popUp('passNot', 'oligarch')"
+          />
+        </div>
+      </div>
+      <div class="col-12"><q-separator /></div>
+      <div class="row col-12 q-pa-md">
+        <div class="col-12 row bg-white q-col-gutter-md">
+          <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">สถานะ</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchReject !== null
+                  ? statusOrder(dataDetail.oligarchReject)
+                  : "-"
+              }}
+            </div>
+          </div>
+          <!-- <div class="col-xs-6 row items-start">
+            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchRejectDate !== null
+                  ? date2Thai(dataDetail.oligarchRejectDate)
+                  : "-"
+              }}
+            </div>
+          </div> -->
+          <div class="col-xs-12 row items-start">
+            <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+            <div class="col-12 text-detail">
+              {{
+                dataDetail.oligarchReject
+                  ? dataDetail.oligarchApproveReason
+                  : dataDetail.oligarchApproveReason
+              }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+
+    <!-- แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -->
+    <q-card bordered class="row col-12 text-dark q-mt-sm">
+      <q-form
+        ref="myForm"
+        greedy
+        @submit.prevent
+        @validation-success="onSubmitAttached"
+      >
+        <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+          <div class="q-pl-sm text-weight-bold text-dark">
+            แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
+          </div>
+          <q-space />
+          <!-- && workflowRef?.permission.isUpdate -->
+          <div v-if="!checkRoutePermisson">
+            <div class="q-gutter-sm" v-if="!edit">
+              <q-btn
+                outline
+                color="primary"
+                dense
+                icon-right="mdi-file-edit-outline"
+                class="q-px-sm"
+                label="แก้ไข"
+                style="width: 80px"
+                @click="edit = !edit"
+                v-if="!(status == 'REPORT' || status == 'DONE')"
+              />
+            </div>
+            <div class="q-gutter-sm" v-else>
+              <q-btn
+                outline
+                color="public"
+                dense
+                class="q-px-sm"
+                label="บันทึก"
+                style="width: 80px"
+                type="submit"
+              />
+              <q-btn
+                outline
+                color="red"
+                dense
+                class="q-px-sm"
+                label="ยกเลิก"
+                style="width: 80px"
+                @click="clickCancel"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row col-12 q-pa-md">
+          <div class="col-12 row bg-white q-col-gutter-md">
+            <div class="col-xs-12 row items-center">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="organizationPositionOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัดเดิม'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่ง/สังกัดเดิม'}`"
+                  type="textarea"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionTypeOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                  hide-bottom-space
+                  :label="`${'ตำแหน่งประเภท'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="positionLevelOld"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
+                  hide-bottom-space
+                  :label="`${'ระดับตำแหน่ง'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-6 col-sm-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="posNo"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่'}`]"
+                  hide-bottom-space
+                  :label="`${'เลขที่'}`"
+                />
+              </div>
+            </div>
+            <!-- <div class="col-xs-6 col-sm-3 row">
+              <div class="col-12">
+                <q-input
+                  v-model="salary"
+                  :outlined="edit"
+                  dense
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  hide-bottom-space
+                  :label="`${'เงินเดือน'}`"
+                  :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                  lazy-rules
+                  :class="getClass(edit)"
+                  mask="###,###,###,###"
+                  reverse-fill-mask
+                />
+              </div>
+            </div> -->
+            <div class="col-12"><q-separator /></div>
+            <div class="col-xs-4 row">
+              <div class="col-12">
+                <q-input
+                  :class="getClass(edit)"
+                  :outlined="edit"
+                  dense
+                  lazy-rules
+                  :readonly="!edit"
+                  :borderless="!edit"
+                  v-model="location"
+                  :rules="[
+                  (val:string) => !!val || `${'กรุณากรอกสถานที่ยื่นขอลาออกจากราชการ'}`,
+                ]"
+                  hide-bottom-space
+                  :label="`${'สถานที่ยื่นขอลาออกจากราชการ'}`"
+                />
+              </div>
+            </div>
+            <div class="col-xs-4 row">
+              <div class="col-12">
+                <datepicker
+                  menu-class-name="modalfix"
+                  :readonly="!edit"
+                  v-model="date"
+                  :locale="'th'"
+                  autoApply
+                  :enableTimePicker="false"
+                  week-start="0"
+                >
+                  <template #year="{ year }">{{ year + 543 }}</template>
+                  <template #year-overlay-value="{ value }">{{
+                    parseInt(value + 543)
+                  }}</template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="!edit"
+                      :class="getClass(edit)"
+                      :outlined="edit"
+                      dense
+                      :borderless="!edit"
+                      :model-value="date !== null ? date2Thai(date) : null"
+                      :rules="[
+                      (val:string) =>
+                        !!val || `${'กรุณาเลือก วันที่ยื่นขอลาออกจากราชการ'}`,
+                    ]"
+                      hide-bottom-space
+                      :label="`${' วันที่ยื่นขอลาออกจากราชการ'}`"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          :style="
+                            edit
+                              ? 'color: var(--q-primary)'
+                              : 'color: var(--q-grey)'
+                          "
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+            </div>
+            <div class="col-12">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="reason"
+                :rules="[
+                (val:string) => !!val || `${'กรุณากรอกเหตุผลที่ลาออกจากราชการ'}`,
+              ]"
+                hide-bottom-space
+                :label="`${'เหตุผลที่ลาออกจากราชการ (หมายเหตุแนวตั้ง)'}`"
+                type="textarea"
+              />
+            </div>
+            <div class="col-12">
+              <q-input
+                :class="getClass(edit)"
+                :outlined="edit"
+                dense
+                lazy-rules
+                :readonly="!edit"
+                :borderless="!edit"
+                v-model="remarkHorizontal"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกหมายเหตุแนวนอน '}`]"
+                hide-bottom-space
+                :label="`${'หมายเหตุแนวนอน '}`"
+                type="textarea"
+              />
+            </div>
+          </div>
+        </div>
+      </q-form>
+    </q-card>
+    <!-- <WorkFlow
+      ref="workflowRef"
+      v-model:is-check-data="isCheckData"
+      :id="id"
+      sys-name="RETIREMENT_CANCEL"
+    /> -->
+  </div>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 800px">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader
+          :tittle="`${
+            actionPass ? 'อนุญาตยกเลิกการลาออก' : 'ยับยั้งยกเลิกการลาออก'
+          }`"
+          :close="closeModal"
+        />
+        <q-separator />
+        <q-card-section class="q-p-sm q-gutter-md">
+          <div class="col-xs-12 col-sm-12 col-md-12">
+            <q-input
+              hide-bottom-space
+              dense
+              outlined
+              lazy-rules
+              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              v-model="reasonReign"
+              :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
+              type="textarea"
+              class="inputgreen"
+            />
+          </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+        <!-- <DialogFooter :editvisible="true" :save="conditionPopup" /> -->
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style lang="scss" scope>
+.q-img {
+  border-radius: 5px;
+  height: 70px;
+}
+.text-top {
+  color: gray;
+  font-weight: 400;
+  padding-bottom: 3px;
+}
+.text-detail {
+  font-weight: 500;
+}
+</style>
diff --git a/src/modules/06_retirement/components/resignEMP/Table.vue b/src/modules/06_retirement/components/resignEMP/Table.vue
new file mode 100644
index 000000000..714e52a14
--- /dev/null
+++ b/src/modules/06_retirement/components/resignEMP/Table.vue
@@ -0,0 +1,385 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+
+import { useRouter } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+import { useDataStore } from "@/modules/06_retirement/store/resignMain";
+import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
+import { checkPermission } from "@/utils/permissions";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { QTableProps } from "quasar";
+import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
+
+import DialogSendToCommand from "@/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue";
+
+/** use */
+const $q = useQuasar(); //ใช้ noti quasar
+const stroe = useRetirementDataStore();
+const stroeResign = useDataStore();
+const { statusText } = stroe;
+const router = useRouter();
+const mixin = useCounterMixin();
+const { messageError, date2Thai, showLoader, hideLoader } = mixin;
+
+/** Table */
+const rows = ref<ResponseItems[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: (row) => rows.value.indexOf(row) + 1,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "fullname",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: (row) => `${row.prefix}${row.firstName} ${row.lastName}`,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "location",
+    align: "left",
+    label: "สถานที่ยื่นขอลาออกจากราชการ",
+    sortable: true,
+    field: "location",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "กลุ่มงาน",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organizationPositionOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationPositionOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "datetext",
+    align: "left",
+    label: "วันที่ยื่น",
+    sortable: true,
+    field: (row) => date2Thai(new Date(row.createdAt)),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sortOrder: "da",
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: (row) => statusText(row.status),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "prefix",
+  "fullname",
+  "location",
+  "positionLevel",
+  "positionNumberOld",
+  "organizationPositionOld",
+  "datetext",
+  "status",
+]);
+const rowsSendToCommand = ref<ResponseItems[]>([]);
+const modal = ref<boolean>(false);
+const filterKeyword2 = ref<string>("");
+const filterKeyword = ref<string>("");
+
+const status = ref<string>("");
+const optionStatus = ref<any[]>([]);
+
+/**Setting pagination */
+const pagination = ref({
+  sortBy: "datetext",
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+/** ฟังก์ชันปิด Popup*/
+function closeModal() {
+  modal.value = false;
+  filterKeyword2.value = "";
+}
+
+/** */
+async function openModalOrder() {
+  const pathAPI =
+    stroeResign.mainTabs === "1"
+      ? `${config.API.listResign()}?type=APPROVE`
+      : `${config.API.listResign()}/cancel?type=APPROVE`;
+  showLoader();
+  await http
+    .get(pathAPI)
+    .then(async (res) => {
+      const data = await res.data.result;
+      const row = await data.filter(
+        (r: ResponseItems) =>
+          (r.status == "REJECT" || r.status == "APPROVE") &&
+          r.organizationPositionOld &&
+          r.positionTypeOld &&
+          r.positionLevelOld &&
+          r.positionNumberOld &&
+          r.location &&
+          r.sendDate
+      );
+      rowsSendToCommand.value = row;
+      modal.value = true;
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/** รายการลาออก*/
+async function fecthlist() {
+  const pathAPI =
+    stroeResign.mainTabs === "1"
+      ? `${config.API.listResignEMP()}?type=${status.value}`
+      : `${config.API.listResignEMP()}/cancel?type=${status.value}`;
+  showLoader();
+  await http
+    .get(pathAPI)
+    .then(async (res) => {
+      const data = await res.data.result;
+      rows.value = data;
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+/**
+ * ฟังก์ชันต้นหาข้อมูลของ Option ขอสถานะ
+ * @param val ค่าที่ต้องการฟิลเตอร์
+ * @param update  อัพเดทค่า
+ */
+function filterOption(val: string, update: Function) {
+  update(() => {
+    status.value = val ? "" : stroeResign.formQurey.status;
+    optionStatus.value = stroeResign.optionStatus.filter(
+      (v: any) => v.name.indexOf(val) > -1
+    );
+  });
+}
+
+function onRedirectToDetail(type: string, id: string) {
+  const test = stroeResign.mainTabsEMP === "1" ? "" : "-reject";
+  router.push(`/retirement/${type}${test}/${id}`);
+}
+
+/**Hook */
+onMounted(async () => {
+  status.value = stroeResign.formQurey.status;
+  optionStatus.value = stroeResign.optionStatusEMP;
+  await fecthlist();
+});
+</script>
+
+<template>
+  <q-card>
+    <div class="row col-12 q-col-gutter-sm">
+      <div class="row col-12">
+        <div class="row q-gutter-sm">
+          <q-select
+            v-model="status"
+            :label="`${'สถานะ'}`"
+            option-label="name"
+            :options="optionStatus"
+            option-value="value"
+            dense
+            emit-value
+            map-options
+            lazy-rules
+            hide-bottom-space
+            outlined
+            use-input
+            @update:model-value="
+              (stroeResign.formQurey.status = status), fecthlist()
+            "
+            @filter="(inputValue:string,doneFn:Function) => filterOption(inputValue, doneFn) "
+          >
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            @click="openModalOrder"
+            flat
+            round
+            color="add"
+            icon="mdi-account-arrow-right"
+          >
+            <q-tooltip>ส่งไปออกคำสั่งลาออก</q-tooltip>
+          </q-btn>
+        </div>
+        <q-space />
+        <div class="row q-gutter-sm">
+          <q-input
+            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="filterKeyword = ''"
+              />
+            </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"
+            
+            style="min-width: 140px"
+          />
+        </div>
+      </div>
+
+      <div class="col-12">
+        <d-table
+          :columns="columns"
+          :rows="rows"
+          :filter="filterKeyword"
+          row-key="id"
+          :visible-columns="visibleColumns"
+          v-model:pagination="pagination"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td auto-width>
+                <q-btn
+                  v-if="checkPermission($route)?.attrIsGet"
+                  flat
+                  dense
+                  round
+                  color="info"
+                  icon="mdi-eye"
+                  @click.pervent="
+                    onRedirectToDetail('resign-employee-detail', props.row.id)
+                  "
+                >
+                  <q-tooltip>รายละเอียด</q-tooltip>
+                </q-btn>
+                <q-btn
+                  v-if="
+                    checkPermission($route)?.attrIsGet &&
+                    checkPermission($route)?.attrIsUpdate
+                  "
+                  flat
+                  dense
+                  round
+                  color="edit"
+                  icon="edit"
+                  @click.pervent="onRedirectToDetail('resign-employee', props.row.id)"
+                >
+                  <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div
+                  :class="
+                    col.name === 'organizationPositionOld' ||
+                    col.name === 'organization'
+                      ? 'table_ellipsis2'
+                      : ''
+                  "
+                >
+                  {{ col.value ? col.value : "" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </div>
+    </div>
+  </q-card>
+
+  <DialogSendToCommand
+    v-model:modal="modal"
+    v-model:filter-keyword2="filterKeyword2"
+    :close-modal="closeModal"
+    :rows="rowsSendToCommand"
+    :fecth-list="fecthlist"
+    :main-tabs="stroeResign.mainTabsEMP"
+  />
+</template>
+<style scoped lang="scss"></style>
diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index a956caa75..8fb842b7d 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -31,10 +31,17 @@ const detaildeceasedByid = () =>
 /** รายการลาออก */
 const resign = () =>
   import("@/modules/06_retirement/components/resign/Main.vue");
+const resign_EMP = () =>
+  import("@/modules/06_retirement/components/resignEMP/Main.vue");
+
 const resignByid = () =>
   import("@/modules/06_retirement/components/resign/ResignByid.vue");
+const resignByidEMP = () =>
+  import("@/modules/06_retirement/components/resignEMP/ResignByid.vue");
 const resignReject = () =>
   import("@/modules/06_retirement/components/resign/ResignReject.vue");
+const resignRejectEMP = () =>
+  import("@/modules/06_retirement/components/resignEMP/ResignReject.vue");
 
 export default [
   {
@@ -128,6 +135,16 @@ export default [
       Role: "STAFF",
     },
   },
+  {
+    path: "/retirement/resign-employee",
+    name: "resignEmployee",
+    component: resign_EMP,
+    meta: {
+      Auth: true,
+      Key: "SYS_RESIGN_EMP",
+      Role: "STAFF",
+    },
+  },
   {
     path: "/retirement/resign/:id",
     name: "resignbyid",
@@ -148,6 +165,31 @@ export default [
       Role: "STAFF",
     },
   },
+
+
+
+  {
+    path: "/retirement/resign-employee/:id",
+    name: "resignbyidEMP",
+    component: resignByidEMP,
+    meta: {
+      Auth: true,
+      Key: "SYS_RESIGN_EMP",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/retirement/resign-employee-detail/:id",
+    name: "resignDetailbyidEMP",
+    component: resignByidEMP,
+    meta: {
+      Auth: true,
+      Key: "SYS_RESIGN_EMP",
+      Role: "STAFF",
+    },
+  },
+
+
   {
     path: "/retirement/resign-reject/:id",
     name: "resignReject",
@@ -169,6 +211,27 @@ export default [
     },
   },
 
+  {
+    path: "/retirement/resign-employee-reject/:id",
+    name: "resignRejectEMP",
+    component: resignRejectEMP,
+    meta: {
+      Auth: true,
+      Key: "SYS_RESIGN_EMP",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/retirement/resign-employee-detail-reject/:id",
+    name: "resignDetailrejectEMP",
+    component: resignRejectEMP,
+    meta: {
+      Auth: true,
+      Key: "SYS_RESIGN_EMP",
+      Role: "STAFF",
+    },
+  },
+
   {
     path: "/retirement/deceased",
     name: "deceased",
diff --git a/src/modules/06_retirement/store/resignMain.ts b/src/modules/06_retirement/store/resignMain.ts
index 1f7ed8e28..6d2dd3d44 100644
--- a/src/modules/06_retirement/store/resignMain.ts
+++ b/src/modules/06_retirement/store/resignMain.ts
@@ -3,6 +3,7 @@ import { ref, computed, reactive, watch } from "vue";
 
 export const useDataStore = defineStore("resign", () => {
   const mainTabs = ref<string>("1");
+  const mainTabsEMP = ref<string>("1");
   const baseOptionStatus = ref<any[]>([
     {
       name: "รอดำเนินการ",
@@ -62,10 +63,18 @@ export const useDataStore = defineStore("resign", () => {
       (option) => option.group === mainTabs.value
     );
   });
+  const optionStatusEMP = computed(() => {
+    return baseOptionStatus.value.filter(
+      (option) => option.group === mainTabsEMP.value
+    );
+  });
 
   watch(mainTabs, (val) => {
     formQurey.status = "WAITTING";
   });
+  watch(mainTabsEMP, (val) => {
+    formQurey.status = "WAITTING";
+  });
 
-  return { mainTabs, formQurey, optionStatus };
+  return { mainTabs, mainTabsEMP, formQurey, optionStatus, optionStatusEMP };
 });