diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 24e34372c..b27a0d3ee 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -478,7 +478,7 @@ const pagination = ref({
 
   <q-dialog v-model="modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปรายการแต่งตั้ง - เลื่อน - ย้าย" :close="clickClose" />
+      <DialogHeader title="ส่งไปออกคำสั่ง" :close="clickClose" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-between">
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue
index 97152019b..4dc67c308 100644
--- a/src/modules/06_retirement/components/resign/Resign.vue
+++ b/src/modules/06_retirement/components/resign/Resign.vue
@@ -276,6 +276,7 @@ const closeModal = () => (modal.value = false);
 const selected = ref<ResponseItems[]>([]);
 const checkSelected = computed(() => {
   if (selected.value.length === 0) {
+
     return true;
   }
 });
@@ -286,12 +287,14 @@ const resetFilter = () => {
 };
 
 const openModalOrder = () => {
+
   openModal();
   const row = filters.value.filter(
     (r: ResponseItems) =>
-      r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
+      r.status == "PENDING" || r.status == "APPROVE" || r.status =="REJECT"
   );
   rows2.value = row;
+
 };
 
 onMounted(async () => {
@@ -327,7 +330,7 @@ const fecthlist = async () => {
           salary: r.salary ? r.salary : 0,
           sendDate: new Date(),
           status: r.status ?? "",
-          statustext: statusText(r.status ?? ""),
+          statustext: status(r.status ?? ""),
           fullname: `${r.firstName ?? ""} ${r.lastName ?? ""}`,
         });
       });
@@ -366,6 +369,24 @@ const saveOrder = async () => {
       hideLoader();
     });
 };
+const status = (val: string) => {
+  switch (val) {
+      case "WAITTING":
+        return "รอดำเนินการ";
+      case "PENDING":
+        return "เลือกตำแหน่งแล้ว";
+      case "APPROVE":
+        return "อนุมัติ";
+      case "REJECT":
+        return "ยับยั้ง";
+      case "REPORT":
+        return "ส่งรายชื่อไปออกคำสั่ง";
+      case "DONE":
+        return "ออกคำสั่งเสร็จแล้ว";
+      default:
+        return "-";
+    }
+};
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">รายการลาออก</div>
@@ -494,6 +515,7 @@ const saveOrder = async () => {
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
+              
               <q-input
                 borderless
                 outlined