diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index 9138047f1..8de51249b 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -1,3 +1,4 @@
+import path from "path";
 import env from "../index";
 const retirement = `${env.API_URI}/retirement`;
 const retirementDischarge = `${retirement}/discharge`;
@@ -104,4 +105,7 @@ export default {
   // สำหรับผู้มีอำนาจ
   approverCancelResign: (typeEmp: string, action: string, id: string) =>
     `${retirement}/resign${typeEmp}/admin-cancel/${action}/${id}`,
+
+  // แก้ไขข้อมูลการลาออก
+  updateResign: (path: string, id: string) => `${retirement}/${path}/admin-update/resign-info/${id}`,
 };
diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 835bb256a..df0a14c49 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -26,6 +26,7 @@ import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 import CardProfile from "@/components/CardProfile.vue";
 import DialogAddCommander from "@/modules/06_retirement/components/DialogAddCommander.vue";
+import DialogFormResign from "@/modules/06_retirement/components/DialogFormResign.vue";
 
 /** Use */
 const $q = useQuasar();
@@ -193,6 +194,8 @@ const actionPass = ref<boolean>(false);
 const reasonReign = ref<string>("");
 const dateBreak = ref<Date | null>(null);
 
+const modalFormResign = ref<boolean>(false);
+
 /** คอลัมน์ */
 const rows = ref<TypeFile[]>([]);
 const columns = ref<QTableProps["columns"]>([
@@ -762,6 +765,18 @@ onMounted(async () => {
     <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 v-if="isStaff && status === 'WAITTING'">
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="mdi-file-edit-outline"
+            class="q-px-sm"
+            label="แก้ไข"
+            @click="modalFormResign = !modalFormResign"
+          />
+        </div>
       </div>
       <div class="col-12"><q-separator /></div>
       <div class="row col-12 q-pa-md">
@@ -785,7 +800,7 @@ onMounted(async () => {
               <div class="col-12 text-top">เหตุผลที่ลาออกจากราชการ</div>
               <div class="col-12 text-detail">
                 {{
-                  `${convertStatus(dataDetail.reason)}${
+                  `${convertStatus(dataDetail.reason)} ${
                     dataDetail.remark ? `(${dataDetail.remark})` : ""
                   }`
                 }}
@@ -1723,6 +1738,12 @@ onMounted(async () => {
     :id-check="idCheck"
     :keycloak-user-id="keycloakUserId"
   />
+
+  <DialogFormResign
+    v-model:modal="modalFormResign"
+    :data="dataDetail"
+    :fetch-data="fetchData"
+  />
 </template>
 
 <style lang="scss" scope>
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index e32532c16..f51b5f56b 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -28,6 +28,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 import CardProfile from "@/components/CardProfile.vue";
 import DialogAddCommander from "@/modules/06_retirement/components/DialogAddCommander.vue";
+import DialogFormResign from "@/modules/06_retirement/components/DialogFormResign.vue";
 
 /** Use */
 const $q = useQuasar();
@@ -228,6 +229,8 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
+const modalFormResign = ref<boolean>(false);
+
 /**ฟังก์ชันปิด popup อนุญาตการลาออก,ยับยั้งการลาออก*/
 function closeModal() {
   modal.value = false;
@@ -790,6 +793,18 @@ onMounted(async () => {
     <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 v-if="isStaff && status === 'WAITTING'">
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="mdi-file-edit-outline"
+            class="q-px-sm"
+            label="แก้ไข"
+            @click="modalFormResign = !modalFormResign"
+          />
+        </div>
       </div>
       <div class="col-12"><q-separator /></div>
       <div class="row col-12 q-pa-md">
@@ -813,7 +828,7 @@ onMounted(async () => {
               <div class="col-12 text-top">เหตุผลที่ลาออกจากราชการ</div>
               <div class="col-12 text-detail">
                 {{
-                  `${convertStatus(dataDetail.reason)}${
+                  `${convertStatus(dataDetail.reason)} ${
                     dataDetail.remark ? `(${dataDetail.remark})` : ""
                   }`
                 }}
@@ -1690,6 +1705,12 @@ onMounted(async () => {
     :id-check="idCheck"
     :keycloak-user-id="keycloakUserId"
   />
+
+  <DialogFormResign
+    v-model:modal="modalFormResign"
+    :data="dataDetail"
+    :fetch-data="fetchData"
+  />
 </template>
 
 <style lang="scss" scope>
diff --git a/src/modules/06_retirement/components/DialogFormResign.vue b/src/modules/06_retirement/components/DialogFormResign.vue
new file mode 100644
index 000000000..40ce37d2e
--- /dev/null
+++ b/src/modules/06_retirement/components/DialogFormResign.vue
@@ -0,0 +1,261 @@
+<script setup lang="ts">
+import { reactive, ref, watch } from "vue";
+import { useQuasar, type QTableProps } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+
+import type { DataOption } from "@/modules/06_retirement/interface/index/Main";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+import { useRoute } from "vue-router";
+
+const modal = defineModel<boolean>("modal", { required: true });
+const props = defineProps({
+  data: Object,
+  fetchData: Function,
+});
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const route = useRoute();
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogConfirm,
+  date2Thai,
+} = mixin;
+
+const paramsId = ref<string>(route.params.id as string);
+const routeName = ref<string>(route?.name as string);
+const formData = reactive({
+  location: "",
+  sendDate: null,
+  activeDate: null,
+  reasonResign: "",
+  remark: "",
+});
+const options = ref<DataOption[]>([
+  {
+    id: "CAREER",
+    name: "ประกอบอาชีพอื่น",
+  },
+  {
+    id: "MOVE",
+    name: "รับราชการสังกัดอื่น",
+  },
+  {
+    id: "FAMILY",
+    name: "ดูแลบิดามารดา",
+  },
+  {
+    id: "EDUCATION",
+    name: "ศึกษาต่อ",
+  },
+  {
+    id: "OTHER",
+    name: "อื่น ๆ",
+  },
+]);
+
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    showLoader();
+    try {
+      const path =
+        routeName.value === "resignbyid" ? "resign" : "resign-employee";
+      const payload = {
+        ...formData,
+        remark: formData.reasonResign === "OTHER" ? formData.remark : undefined,
+      };
+
+      await http.put(config.API.updateResign(path, paramsId.value), payload);
+      await props.fetchData?.(paramsId.value);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      closeDialog();
+    } catch (error) {
+      messageError(error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+function closeDialog() {
+  modal.value = false;
+  formData.location = "";
+  formData.sendDate = null;
+  formData.activeDate = null;
+  formData.reasonResign = "";
+  formData.remark = "";
+}
+
+watch(
+  () => modal.value,
+  (val) => {
+    if (val) {
+      const data = props.data;
+      formData.location = data?.location || "";
+      formData.sendDate = data?.sendDate || null;
+      formData.activeDate = data?.activeDate || null;
+      formData.reasonResign = data?.reason || "";
+      formData.remark = data?.remark || "";
+    }
+  }
+);
+</script>
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card class="col-12" style="width: 60%; max-width: 900px">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <DialogHeader :tittle="'แก้ไขข้อมูลการลาออก'" :close="closeDialog" />
+        <q-separator />
+
+        <q-card-section>
+          <div class="row q-pa-sm q-col-gutter-sm">
+            <div class="col-6">
+              <q-input
+                class="inputgreen"
+                dense
+                outlined
+                v-model="formData.location"
+                hide-bottom-space
+                label="สถานที่ยื่นขอลาออกจากราชการ"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกสถานที่ยื่นขอลาออกจากราชการ'}`]"
+              />
+            </div>
+            <div class="col-3">
+              <datepicker
+                class="inputgreen"
+                menu-class-name="modalfix"
+                v-model="formData.sendDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :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
+                    hide-bottom-space
+                    class="full-width"
+                    :model-value="
+                      formData.sendDate != null
+                        ? date2Thai(formData.sendDate)
+                        : null
+                    "
+                    :label="`${'วันที่ยื่นขอลาออกจากราชการ'}`"
+                    :rules="[
+                          (val: string) =>
+                            !!val || `${'กรุณาเลือกวันที่ยื่นขอลาออกจากราชการ'}`,
+                        ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-3">
+              <datepicker
+                class="inputgreen"
+                menu-class-name="modalfix"
+                v-model="formData.activeDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :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
+                    hide-bottom-space
+                    class="full-width"
+                    :model-value="
+                      formData.activeDate != null
+                        ? date2Thai(formData.activeDate)
+                        : null
+                    "
+                    :label="`${'วันที่ขอลาออกจากราชการ'}`"
+                    :rules="[
+                          (val: string) =>
+                            !!val || `${'กรุณาเลือกวันที่ขอลาออกจากราชการ'}`,
+                        ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-12">
+              <q-select
+                v-model="formData.reasonResign"
+                class="inputgreen"
+                dense
+                outlined
+                emit-value
+                map-options
+                hide-bottom-space
+                option-label="name"
+                option-value="id"
+                :options="options"
+                label="เหตุผลที่ลาออกจากราชการ"
+                :rules="[(val: string) => !!val || `${'กรุณาเลือกเหตุผลที่ลาออกจากราชการ'}`]"
+              />
+            </div>
+            <div class="col-12" v-if="formData.reasonResign === 'OTHER'">
+              <q-input
+                class="inputgreen"
+                v-model="formData.remark"
+                outlined
+                hide-bottom-space
+                dense
+                type="textarea"
+                label="ระบุเหตุผล"
+                :rules="[(val: string) => !!val || `${'กรุณาระบุเหตุผล'}`,]"
+              />
+            </div>
+          </div>
+        </q-card-section>
+        <q-separator />
+
+        <q-card-actions align="right">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>