diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index 9440ee1ea..d151fe55a 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -3,11 +3,12 @@ import { ref, watch } from "vue";
 import DialogHeader from "@/components/DialogHeader.vue";
 
 const reason = ref<string | undefined>("");
+const modal = defineModel<boolean>("modal", { required: true });
 const props = defineProps({
-  modal: {
-    type: Boolean,
-    default: false,
-  },
+  // modal: {
+  //   type: Boolean,
+  //   default: false,
+  // },
   title: {
     type: String,
     default: "",
@@ -16,10 +17,10 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  clickClose: {
-    type: Function,
-    default: () => {},
-  },
+  // clickClose: {
+  //   type: Function,
+  //   default: () => {},
+  // },
   savaForm: {
     type: Function,
     default: () => {},
@@ -29,7 +30,7 @@ const props = defineProps({
   },
 });
 watch(props, () => {
-  if (props.modal === true && props.textReport == "") {
+  if (modal.value === true && props.textReport == "") {
     reason.value = "";
   } else {
     reason.value = props.textReport;
@@ -44,13 +45,17 @@ const submit = () => {
     }
   });
 };
+
+function closeModal() {
+  modal.value = false
+}
 </script>
 
 <template>
-  <q-dialog v-model="props.modal" persistent>
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 40vw; max-width: 40vw">
       <q-form ref="myForm">
-        <DialogHeader :tittle="props.title" :close="clickClose" />
+        <DialogHeader :tittle="props.title" :close="closeModal" />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/04_registryNew/components/detail/Achievement/Main.vue b/src/modules/04_registryNew/components/detail/Achievement/Main.vue
index 76961142d..7b717afeb 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/Main.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/Main.vue
@@ -13,7 +13,7 @@ const tab = ref<string>("1");
 <template>
   <div class="row items-center q-mb-lg">
     <div class="text-dark row items-center" style="font-size: 22px">
-      <q-icon name="mdi-cash" class="q-mr-md" />
+      <q-icon name="mdi-medal" class="q-mr-md" />
       <span>ข้อมูลผลงานและเครื่องราชฯ</span>
     </div>
   </div>
@@ -25,7 +25,7 @@ const tab = ref<string>("1");
     class="text-grey"
     active-color="blue"
     indicator-color="white"
-    align="justify"
+    align="left"
     narrow-indicator
     bordered
   >
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue
index 5ed90d2a8..7978d9e98 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue
@@ -11,7 +11,7 @@ const tab = ref<string>("1");
 </script>
 <template>
   <div class="row items-center q-mb-lg">
-    <div class="text-dark row items-center" style="font-size: 22px">
+    <div class="text-dark row items-center text-weight-bold" style="font-size: 20px">
       <q-icon name="mdi-account-tie" class="q-mr-md" />
       <span>ข้อมูลราชการ</span>
     </div>
@@ -24,7 +24,7 @@ const tab = ref<string>("1");
     class="text-grey"
     active-color="blue"
     indicator-color="white"
-    align="justify"
+    align="left"
     narrow-indicator
     bordered
   >
diff --git a/src/modules/04_registryNew/components/detail/Other/Main.vue b/src/modules/04_registryNew/components/detail/Other/Main.vue
index 494c2138e..b981c40ee 100644
--- a/src/modules/04_registryNew/components/detail/Other/Main.vue
+++ b/src/modules/04_registryNew/components/detail/Other/Main.vue
@@ -9,7 +9,7 @@ const tab = ref<string>("1");
 </script>
 <template>
   <div class="row items-center q-mb-lg">
-    <div class="text-dark row items-center" style="font-size: 22px">
+    <div class="text-dark row items-center text-weight-bold" style="font-size: 20px">
       <q-icon name="mdi-bookmark" class="q-mr-md" />
       <span>เอกสารหลักฐานและอื่นๆ</span>
     </div>
@@ -22,7 +22,7 @@ const tab = ref<string>("1");
     class="text-grey"
     active-color="blue"
     indicator-color="white"
-    align="justify"
+    align="left"
     narrow-indicator
     bordered
   >
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/Main.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/Main.vue
index 6b382cb68..a19b72826 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/Main.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/Main.vue
@@ -13,7 +13,10 @@ const tab = ref<string>("1");
 </script>
 <template>
   <div class="row items-center q-mb-lg">
-    <div class="text-dark row items-center" style="font-size: 22px">
+    <div
+      class="text-dark row items-center text-weight-bold"
+      style="font-size: 20px"
+    >
       <q-icon name="mdi-account" class="q-mr-md" />
       <span>ข้อมูลส่วนตัว</span>
     </div>
@@ -26,7 +29,7 @@ const tab = ref<string>("1");
     class="text-grey"
     active-color="blue"
     indicator-color="white"
-    align="justify"
+    align="left"
     narrow-indicator
     bordered
   >
diff --git a/src/modules/04_registryNew/components/detail/Salary/Main.vue b/src/modules/04_registryNew/components/detail/Salary/Main.vue
index dc8c8124b..ba24c14ab 100644
--- a/src/modules/04_registryNew/components/detail/Salary/Main.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/Main.vue
@@ -9,8 +9,11 @@ const tab = ref<string>("1");
 </script>
 <template>
   <div class="row items-center q-mb-lg">
-    <div class="text-dark row items-center" style="font-size: 22px">
-      <q-icon name="mdi-account" class="q-mr-md" />
+    <div
+      class="text-dark row items-center text-weight-bold"
+      style="font-size: 20px"
+    >
+      <q-icon name="mdi-cash" class="q-mr-md" />
       <span>ข้อมูลเงินเดือน/ค่าจ้าง</span>
     </div>
   </div>
@@ -22,7 +25,7 @@ const tab = ref<string>("1");
     class="text-grey"
     active-color="blue"
     indicator-color="white"
-    align="justify"
+    align="left"
     narrow-indicator
     bordered
   >
diff --git a/src/modules/04_registryNew/components/detail/TabMain.vue b/src/modules/04_registryNew/components/detail/TabMain.vue
index de806977d..17bca957e 100644
--- a/src/modules/04_registryNew/components/detail/TabMain.vue
+++ b/src/modules/04_registryNew/components/detail/TabMain.vue
@@ -24,12 +24,12 @@ const itemsTab = ref<any>([
   },
   {
     name: "3",
-    icon: "mail",
+    icon: "mdi-cash",
     label: "ข้อมูลเงินเดือน/ค่าจ้าง",
   },
   {
     name: "4",
-    icon: "mdi-cash",
+    icon: "mdi-medal",
     label: "ข้อมูลผลงานและเครื่องราชฯ",
   },
   {
@@ -46,6 +46,7 @@ const splitterModel = ref<number>(12);
     <template v-slot:before>
       <q-tabs v-model="store.tabMain" vertical class="text-blue">
         <q-tab
+          class="hover-tab"
           v-for="(tab, index) in itemsTab"
           :key="index"
           :name="tab.name"
@@ -80,4 +81,10 @@ const splitterModel = ref<number>(12);
   </q-splitter>
 </template>
 
-<style scoped></style>
+<style scoped>
+.hover-tab:hover {
+  background-color: #0793f1;
+  color: white !important;
+  opacity: 1 !important;
+}
+</style>
diff --git a/src/modules/04_registryNew/router.ts b/src/modules/04_registryNew/router.ts
index 23717baee..45327c5b2 100644
--- a/src/modules/04_registryNew/router.ts
+++ b/src/modules/04_registryNew/router.ts
@@ -1,4 +1,3 @@
-const mainPage = () => import("@/modules/04_registryNew/views/main.vue");
 const listPage = () => import("@/modules/04_registryNew/views/list.vue");
 const detailPage = () =>
   import("@/modules/04_registryNew/views/detailView.vue");
diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue
index b23d8c8ad..96a8a3d7c 100644
--- a/src/modules/04_registryNew/views/detailView.vue
+++ b/src/modules/04_registryNew/views/detailView.vue
@@ -1,9 +1,70 @@
 <script setup lang="ts">
-import { useRouter } from "vue-router";
+import { ref, onMounted } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type { DataPerson } from "@/modules/04_registryNew/interface/response/Main";
 
 import TabMain from "@/modules/04_registryNew/components/detail/TabMain.vue";
-
 const router = useRouter();
+const route = useRoute();
+
+const profileId = ref<string>(route.params.id.toString());
+const formDetail = ref<DataPerson>();
+const itemsMenu = ref<DataOption[]>([
+  {
+    id: "1",
+    name: "ช่วยราชการ",
+  },
+  {
+    id: "2",
+    name: "ส่งตัวกลับ",
+  },
+  {
+    id: "3",
+    name: "แต่งตั้ง-เลื่อน-ย้าย",
+  },
+  {
+    id: "4",
+    name: "ถึงแก่กรรม",
+  },
+  {
+    id: "5",
+    name: "ให้ออกจากราชการ",
+  },
+  {
+    id: "6",
+    name: "อื่นๆ",
+  },
+]);
+
+function fetchDataPersonal() {
+  const data = {
+    id: "1526d9d3-d8b1-43ab-81b5-a84dfbe99201",
+    prefix: "นาย",
+    firstName: "ณัฐพงศ์",
+    lastName: "ดิษยบุตร",
+    citizenId: "0000000000001",
+    position: "นักบริหาร",
+    posLevelId: "1526d9d3-d8b1-43ab-81b5-a84dfbe09362",
+    posTypeId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08091",
+  };
+
+  formDetail.value = data;
+}
+
+function onClickDownloadKp7(type: string) {
+  if (type === "FULL") {
+    window.open(config.API.profileReportId(profileId.value));
+  } else if (type === "SHORT") {
+    window.open(config.API.profileKp7ShortId(profileId.value));
+  }
+}
+onMounted(() => {
+  fetchDataPersonal();
+});
 </script>
 <template>
   <div class="row items-center q-gutter-sm">
@@ -30,49 +91,53 @@ const router = useRouter();
       icon="mdi-home-export-outline"
       dropdown-icon="mdi-chevron-down"
     >
-      <q-list>
+      <q-list v-for="(item, index) in itemsMenu" key="index">
         <q-item clickable v-close-popup>
-          <q-item-section avatar>
-            <q-avatar icon="folder" color="primary" text-color="white" />
-          </q-item-section>
-          <q-item-section>
-            <q-item-label>Photos</q-item-label>
-            <q-item-label caption>February 22, 2016</q-item-label>
-          </q-item-section>
-          <q-item-section side>
-            <q-icon name="info" color="amber" />
-          </q-item-section>
-        </q-item>
-
-        <q-item clickable v-close-popup>
-          <q-item-section avatar>
-            <q-avatar icon="assignment" color="secondary" text-color="white" />
-          </q-item-section>
-          <q-item-section>
-            <q-item-label>Vacation</q-item-label>
-            <q-item-label caption>February 22, 2016</q-item-label>
-          </q-item-section>
-          <q-item-section side>
-            <q-icon name="info" color="amber" />
-          </q-item-section>
+          <q-item-section>{{ item.name }}</q-item-section>
         </q-item>
       </q-list>
     </q-btn-dropdown>
+
     <q-btn
       unelevated
       round
       color="grey-4"
       text-color="primary"
       icon="mdi-file-eye-outline"
-    />
+    >
+      <q-tooltip>ดาวน์ไฟล์</q-tooltip>
+      <q-menu>
+        <q-list style="min-width: 120px">
+          <q-item clickable v-close-popup @click="onClickDownloadKp7('FULL')">
+            <q-item-section class="text-blue">ก.พ.7/ก.ก.1</q-item-section>
+          </q-item>
+          <q-item clickable v-close-popup @click="onClickDownloadKp7('SHORT')">
+            <q-item-section class="text-primary">ประวัติแบบย่อ</q-item-section>
+          </q-item>
+        </q-list>
+      </q-menu>
+    </q-btn>
   </div>
 
   <q-card>
-    <div class="column" style="height: 150px; position: relative">
-      <div class="col justify-center"></div>
+    <div class="column" style="height: 170px">
+      <div class="col row items-center">
+        <div class="row col-12">
+          <div class="col-sm-3 col-md-2"></div>
+          <div class="col">
+            <div class="col-12 text-primary" style="font-size: 20px">
+              {{
+                `${formDetail?.prefix}${formDetail?.firstName}  ${formDetail?.lastName}`
+              }}
+            </div>
+            <div class="col-12">{{ formDetail?.position }}</div>
+          </div>
+        </div>
+      </div>
+
       <div class="absolute-center-left q-ml-lg">
         <q-avatar size="130px">
-          <img src="https://cdn.quasar.dev/img/avatar2.jpg" />
+          <img src="@/assets/avatar_user.jpg" />
         </q-avatar>
         <q-btn
           round
@@ -82,7 +147,30 @@ const router = useRouter();
           style="position: absolute; bottom: 0; right: 0"
         />
       </div>
-      <div class="col bg-teal-2"></div>
+
+      <div class="col row items-center bg-teal-1">
+        <div class="row col-12">
+          <div class="col-sm-3 col-md-2"></div>
+          <div class="col-2">
+            <div class="col-sm-3 col-md-3">
+              <div class="col text-grey-5">ตำแหน่งในสายงาน</div>
+              <div class="col">หัวหน้าสำนักงาน</div>
+            </div>
+          </div>
+          <div class="col-2">
+            <div class="col-sm-3 col-md-3">
+              <div class="col text-grey-5">ประเภทตำแหน่ง</div>
+              <div class="col">บริหาร</div>
+            </div>
+          </div>
+          <div class="col-2">
+            <div class="col-sm-3 col-md-3">
+              <div class="col text-grey-5">ระดับตำแหน่งง</div>
+              <div class="col">สำนาญการพิเศษ</div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </q-card>
 
diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue
index bbcd28ff0..98a6feb57 100644
--- a/src/modules/04_registryNew/views/list.vue
+++ b/src/modules/04_registryNew/views/list.vue
@@ -141,6 +141,13 @@ function onClickShowFilter() {
 }
 
 function onclickSearch() {
+  isShowFilter.value = true;
+  isShowBtnFilter.value = false;
+  if (isShowFilter.value) {
+    fetchType();
+    fetchLevel();
+    fetchYearOption();
+  }
   formFilter.keyword = formFilter.keyword === null ? "" : formFilter.keyword;
   fetchDataPerson();
 }
diff --git a/src/modules/04_registryNew/views/main.vue b/src/modules/04_registryNew/views/main.vue
deleted file mode 100644
index 22bd55098..000000000
--- a/src/modules/04_registryNew/views/main.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script setup lang="ts">
-import Registry from "@/modules/04_registryNew/components/registry/registry.vue";
-</script>
-<template>
-  <div class="toptitle text-dark col-12 row items-center">
-    ข้อมูลทะเบียนประวัติ
-  </div>
-
-  <q-card flat bordered class="q-pa-md"> <Registry /> </q-card>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index f4dc09335..5993b15b1 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -416,7 +416,7 @@ const saveEdiitReport = (reason: string) => {
         })
         .finally(() => {
           fecthlistprofile(retireld.value);
-          closemodalEditReport();
+          modalEdit.value = false;
         });
     },
     "ยืนยันการแก้ไขข้อมูล",
@@ -429,11 +429,6 @@ const openmodalEditReport = () => {
   modalEdit.value = true;
 };
 
-// ปิด popup เหตุผล
-const closemodalEditReport = () => {
-  modalEdit.value = false;
-};
-
 /** Setting Pagination */
 const paging = ref<boolean>(true);
 const pagination = ref({
@@ -876,10 +871,9 @@ function updatemodalPersonal(modal: boolean) {
   </q-dialog>
 
   <DialogPopupReason
-    :modal="modalEdit"
+    v-model:modal="modalEdit"
     title="แก้ไขมติ อ.ก.ก."
     label="มติ อ.ก.ก."
-    :click-close="closemodalEditReport"
     :savaForm="saveEdiitReport"
     :textReport="textReport"
   />
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index ab289ab1b..0234433f5 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -479,11 +479,6 @@ function clickReject(id: string) {
   rowid.value = id;
 }
 
-/** function closePopup ไม่ยืนขอ*/
-function closemodelPopupReject() {
-  modelPopupReject.value = false;
-}
-
 /**
  * function ยืนยันการไม่ยืนขอ
  * @param reason  หมายเหตุ
@@ -520,7 +515,7 @@ async function listreject(profileId: string, reason: string) {
           props.tab
         );
       }
-      await closemodelPopupReject();
+      modelPopupReject.value = await false;
     });
 }
 
@@ -1375,10 +1370,9 @@ onMounted(async () => {
 
   <!-- popup เหตุผลไม่ยื่นขอ -->
   <DialogPopupReason
-    :modal="modelPopupReject"
+    v-model:modal="modelPopupReject"
     title="เหตุผลการไม่ยื่นขอ"
     label="หมายเหตุ"
-    :click-close="closemodelPopupReject"
     :savaForm="savaReasonReject"
   />
   <!--  เหตุผลที่ลบออก -->
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue
index 57bc7e930..9d8fa1ce7 100644
--- a/src/modules/07_insignia/components/2_Manage/listManage.vue
+++ b/src/modules/07_insignia/components/2_Manage/listManage.vue
@@ -233,20 +233,12 @@ async function sendToDirector() {
 async function popupBackToEdit() {
   modalPopupBackToEdit.value = true;
 }
-/** function close popup แก้ไข*/
-async function closeModalPopupBackToEdit() {
-  modalPopupBackToEdit.value = false;
-}
 
 const modalbackInsignia2Role = ref<boolean>(false);
 /**function  open popup ตีกลับ admin*/
 const popupBackToInsignia2Role = async () => {
   modalbackInsignia2Role.value = true;
 };
-/**function  close popup ตีกลับ admin*/
-const closepopupBackToInsignia2Role = async () => {
-  modalbackInsignia2Role.value = false;
-};
 
 /**
  * funtion ยืนยันการ ตีกลับรอบการเสนอขอ  เฉพาะ รอบที่ requestStatus st3 และ insignia2Role
@@ -277,7 +269,7 @@ async function backToEdit(reason: string) {
           messageError($q, err);
         })
         .finally(() => {
-          closeModalPopupBackToEdit();
+          modalPopupBackToEdit.value = false;
           hideLoader();
         });
     },
@@ -339,7 +331,7 @@ async function backToEditinsignia2Role(reason: string) {
         messageError($q, err);
       })
       .finally(() => {
-        closepopupBackToInsignia2Role();
+        modalbackInsignia2Role.value = false;
       });
   });
 }
@@ -660,17 +652,15 @@ onMounted(async () => {
 
     <!-- popup หมายเหตุ -->
     <DialogPopupReason
-      :modal="modalPopupBackToEdit"
+    v-model:modal="modalPopupBackToEdit"
       title="หมายเหตุการตีกลับ"
       label="หมายเหตุ"
-      :click-close="closeModalPopupBackToEdit"
       :savaForm="backToEdit"
     />
     <DialogPopupReason
-      :modal="modalbackInsignia2Role"
+    v-model:modal="modalbackInsignia2Role"
       title="หมายเหตุการตีกลับ"
       label="หมายเหตุ"
-      :click-close="closepopupBackToInsignia2Role"
       :savaForm="backToEditinsignia2Role"
     />
   </q-card>
diff --git a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
index d472db3ff..2117151d9 100644
--- a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
+++ b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue
@@ -211,11 +211,6 @@ function clickClose() {
   modal.value = false;
 }
 
-/** function closePopupNote*/
-function clickCloseNote() {
-  addNote.value = false;
-}
-
 /** function openPopupAdd*/
 function clickAdd() {
   modal.value = true;
@@ -499,10 +494,9 @@ const resetFilter2 = () => {
     </q-card>
   </q-dialog>
   <DialogPopupReason
-    :modal="addNote"
+    v-model:modal="addNote"
     title="คืนเครื่องราชฯ"
     label="กรอกเหตุผลที่ต้องการคืนเครื่องราชฯ"
-    :click-close="clickCloseNote"
     :savaForm="saveNote"
   />
 </template>
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 60fc4d4e8..1115fb2d7 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -51,9 +51,6 @@ const typePdf = ref<string>("pdf");
 const dialogTitleUnapprove = ref<string>("ไม่อนุมัติ");
 const dialogTitle = ref<string>("อนุมัติ");
 const dialogLabel = ref<string>("เหตุผล");
-const closeDialog = () => {
-  modalApprove.value = false;
-};
 
 /** ฟังก์ชั่น อัปโหลด
  * consolelog ไว้ก่อน
@@ -816,10 +813,9 @@ function formattedNumber(x: number) {
     </div>
   </q-card>
   <DialogReason
-    :modal="modalApprove"
+    v-model:modal="modalApprove"
     :title="dialogTitle"
     :label="dialogLabel"
-    :click-close="closeDialog"
     :savaForm="clickSave"
   />
 </template>
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index 5e2422dd7..43d06ff2d 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -52,9 +52,6 @@ const typePdf = ref<string>("pdf");
 const modalApprove = ref(false);
 const dialogTitleUnapprove = ref<string>("ไม่อนุมัติ");
 const dialogTitle = ref<string>("อนุมัติ");
-const closeDialog = () => {
-  modalApprove.value = false;
-};
 
 /** ฟังก์ชั่น อัปโหลด
  * consolelog ไว้ก่อน
@@ -755,9 +752,8 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
     </div>
   </q-card>
   <DialogReason
-    :modal="modalApprove"
+    v-model:modal="modalApprove"
     :title="dialogTitle"
-    :click-close="closeDialog"
     label="เหตุผล"
     :savaForm="clickSave"
   />
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
index 5b4b2fdc1..b59049338 100644
--- a/src/modules/09_leave/interface/request/leave.ts
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -89,7 +89,7 @@ interface FremData {
   coupleDaySumTotalHistory: string; //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
   approveStep: string;
   dear: string;
-  leaveRange: string;
+  leaveRange?: string;
 }
 
 export type { ListsData, FremData, QuerySting, DateFilter };
diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/SpecialTimeMain.vue
index ab8d8e903..82d4f69de 100644
--- a/src/modules/09_leave/views/SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/SpecialTimeMain.vue
@@ -363,10 +363,9 @@ const monthYearThai = (val: any) => {
   </q-card>
 
   <DialogReason
-    :modal="modalUnapprove"
+    v-model:modal="modalUnapprove"
     :title="dialogTitle"
     :desc="dialogDesc"
-    :click-close="closeDialog"
     label="เหตุผล"
     :savaForm="clickSave"
   />
diff --git a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
index 526920774..811975d4b 100644
--- a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
+++ b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue
@@ -47,50 +47,77 @@ async function uploadFile(event: any) {
   );
 }
 
-function sendToDirector() {}
+function saveReccommend() {
+  dialogConfirm(
+    $q,
+    async () => {
+      sendStep.value = sendStep.value + 1;
+      modalRecommend.value = false;
+    },
+    "ยืนยันการ" + titleRecommend.value,
+    "ต้องการยืนยันการ" + titleRecommend.value + "หรือไม่?"
+  );
+}
+
+function sendToDirector(msg: string) {
+  dialogConfirm(
+    $q,
+    async () => {
+      sendStep.value = sendStep.value == 3 ? 6 : sendStep.value + 1;
+    },
+    "ยืนยันการ" + msg,
+    "ต้องการยืนยันการ" + msg + "หรือไม่?"
+  );
+}
+
+const modalRecommend = ref<boolean>(false);
+const titleRecommend = ref<string>("");
+function sendAndRecommend(title: string) {
+  modalRecommend.value = true;
+  titleRecommend.value = title;
+}
 </script>
 
 <template>
   <div class="row col-12 q-pa-md">
-    <q-toolbar class="text-primary">
-      <div>
-        <q-file
-          v-if="sendStep == 1"
-          bg-color="white"
-          clearable
-          outlined
-          dense
-          v-model="fileUpload"
-          accept=".pdf"
-          label="อัปโหลดไฟล์"
-        >
-          <template v-slot:prepend>
-            <q-icon color="light-blue" name="attach_file" />
-            <q-tooltip>อัปโหลดไฟล์</q-tooltip>
-          </template>
-        </q-file>
+    <q-toolbar>
+      <q-file
+        v-if="sendStep == 1"
+        bg-color="white"
+        clearable
+        outlined
+        dense
+        v-model="fileUpload"
+        accept=".pdf"
+        label="อัปโหลดไฟล์"
+      >
+        <template v-slot:prepend>
+          <q-icon color="light-blue" name="attach_file" />
+          <q-tooltip>อัปโหลดไฟล์</q-tooltip>
+        </template>
+      </q-file>
 
+      <q-btn
+        flat
+        color="light-blue"
+        icon="upload"
+        @click="uploadFile(fileUpload)"
+        v-if="fileUpload !== null"
+      />
+      <div v-if="document">
         <q-btn
-          flat
-          color="light-blue"
-          icon="upload"
-          @click="uploadFile(fileUpload)"
-          v-if="fileUpload !== null"
-        />
-        <div v-if="document">
-          <q-btn
-            dense
-            color="primary"
-            icon-right="mdi-download"
-            label="ดาวน์โหลดไฟล์"
-            outline
-            :href="document"
-            target="_blank"
-          >
-            <q-tooltip>ดาวน์โหลด</q-tooltip></q-btn
-          >
-        </div>
+          dense
+          color="primary"
+          icon-right="mdi-download"
+          label="ดาวน์โหลดไฟล์"
+          outline
+          :href="document"
+          target="_blank"
+        >
+          <q-tooltip>ดาวน์โหลด</q-tooltip></q-btn
+        >
       </div>
+
       <q-toolbar-title>
         <!-- Toolbar -->
       </q-toolbar-title>
@@ -101,7 +128,7 @@ function sendToDirector() {}
           unelevated
           color="public"
           label="ส่งเอกสารให้ ผอ. ตรวจสอบ"
-          @click="sendToDirector()"
+          @click="sendToDirector('ส่งเอกสารให้ ผอ. ตรวจสอบ')"
         />
 
         <!-- ผอ. หน่วยงานทำการยืนยันและส่งให้ สกจ. -->
@@ -110,37 +137,53 @@ function sendToDirector() {}
           unelevated
           color="public"
           label="ยืนยันและส่งเอกสารให้ สกจ."
-          @click="sendToDirector()"
+          @click="sendToDirector('ยืนยันและส่งเอกสารให้ สกจ.')"
         />
 
         <!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา ไม่มีปรับโควต้า -->
         <q-btn
           v-if="sendStep == 3"
           unelevated
-          color="public"
+          color="green"
           label="ยืนยันการตรวจสอบ"
-          @click="sendToDirector()"
+          @click="sendToDirector('ยืนยันการตรวจสอบ')"
         />
 
         <!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา มีปรับโควต้า -->
         <q-btn
-          v-if="sendStep == 4"
+          v-if="sendStep == 3"
+          class="q-ml-sm"
           unelevated
-          color="public"
+          color="warning"
           label="ส่งคำแนะนำให้ ผอ. ตรวจสอบ"
-          @click="sendToDirector()"
+          @click="sendAndRecommend('ส่งคำแนะนำให้ ผอ. ตรวจสอบ')"
         />
 
         <!-- ผอ.หน่วยงานส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน -->
         <q-btn
-          v-if="sendStep == 5"
+          v-if="sendStep == 4"
           unelevated
           color="public"
           label="ส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน"
-          @click="sendToDirector()"
+          @click="sendAndRecommend('ส่งคำแนะนำให้ ผอ. ตรวจสอบ')"
+        />
+
+        <q-btn
+          v-if="sendStep > 4"
+          unelevated
+          color="public"
+          label="ส่งไปออกคำสั่ง"
         />
       </div>
     </q-toolbar>
+
+    <DialogPopupReason
+      v-model:modal="modalRecommend"
+      :title="titleRecommend"
+      label="คำแนะนำ"
+      :savaForm="saveReccommend"
+      textReport=""
+    />
   </div>
 </template>