From 9d3601f23f3bfcef661072c3c07cfeb36297f43f Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 21 Oct 2024 17:56:47 +0700
Subject: [PATCH] isLeave

---
 .../Achievement/01_ProfessionalLicense.vue    | 12 +++++++---
 .../detail/Achievement/02_Train.vue           | 12 +++++++---
 .../detail/Achievement/03_Insignia.vue        | 13 ++++++++---
 .../Achievement/04_DeclarationHonor.vue       | 13 ++++++++---
 .../Achievement/05_ResultsPerformance.vue     | 13 ++++++++---
 .../components/detail/Achievement/Main.vue    | 14 +++++++-----
 .../detail/Employee/01_DataEmployee.vue       |  9 +++++++-
 .../detail/Employee/02_Employment.vue         | 13 ++++++++---
 .../components/detail/Employee/Main.vue       |  8 +++++--
 .../detail/GovernmentInformation/01_Info.vue  |  8 ++++++-
 .../GovernmentInformation/02_Discipline.vue   | 13 ++++++++---
 .../02_DisciplineHistory.vue                  |  7 +++++-
 .../detail/GovernmentInformation/03_Leave.vue | 12 +++++++---
 .../GovernmentInformation/03_LeaveHistory.vue |  6 +++++
 .../04_PerformSpecialWork.vue                 | 12 +++++++---
 .../04_PerformSpecialWorkHistory.vue          |  6 +++++
 .../detail/GovernmentInformation/Main.vue     | 11 ++++++----
 .../detail/Other/01_OtherInformation.vue      | 13 ++++++++---
 .../components/detail/Other/02_Document.vue   | 10 ++++++++-
 .../components/detail/Other/Main.vue          |  8 +++++--
 .../detail/PersonalInformation/01_Profile.vue |  3 ++-
 .../02_NameChangeHistory.vue                  |  3 ++-
 .../detail/PersonalInformation/03_Address.vue |  9 +++++++-
 .../PersonalInformation/04_FamilyNew.vue      | 16 +++++++++-----
 .../PersonalInformation/05_Education.vue      | 14 ++++++++----
 .../PersonalInformation/06_SpecialSkill.vue   | 14 +++++++++---
 .../detail/PersonalInformation/Main.vue       | 22 ++++++++++++++-----
 .../detail/Salary/01_PositionSalary.vue       | 17 +++++++++-----
 .../detail/Salary/02_NotReceiveSalary.vue     | 13 ++++++++---
 .../components/detail/Salary/Main.vue         |  8 +++++--
 src/modules/04_registryPerson/store.ts        |  2 ++
 .../04_registryPerson/views/detailView.vue    |  7 +++++-
 32 files changed, 262 insertions(+), 79 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
index 0f7dd22ea..2c4057682 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -29,6 +29,12 @@ const {
 
 const id = ref<string>(route.params.id.toString());
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
+/**
+ * props
+ */
+const props = defineProps({
+  isLeave: Boolean,
+});
 
 const mode = ref<string>("table"); //การแสดงผล Table,Card
 const dialog = ref<boolean>(false); //แสดง popup ข้อมูลใบอนุญาตประกอบวิชาชีพ
@@ -371,7 +377,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
       round
       flat
       color="primary"
@@ -480,7 +486,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -521,7 +527,7 @@ onMounted(() => {
               <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
               round
               color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
index 9c8b4d0be..c12402987 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -13,6 +13,12 @@ import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/r
 import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Training";
 
 import dialogHeader from "@/components/DialogHeader.vue";
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 
 const route = useRoute();
 const $q = useQuasar();
@@ -525,7 +531,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       round
       dense
       flat
@@ -636,7 +642,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -676,7 +682,7 @@ onMounted(() => {
               <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
               round
               color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index 2ec76735b..e82115daf 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -35,6 +35,13 @@ const {
   pathRegistryEmp,
 } = mixin;
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -649,7 +656,7 @@ onMounted(async () => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -769,7 +776,7 @@ onMounted(async () => {
           </q-btn>
 
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -802,7 +809,7 @@ onMounted(async () => {
               <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
               round
               color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
index f7c3dbb1c..262c34055 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -32,6 +32,13 @@ const profileId = ref<string>(
 );
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const id = ref<string>(""); //id ที่ต้องการแก้ไข
 const issueDateYear = ref<number>(0); //ปีที่ได้รับ
 const declHonorForm = reactive<RequestItemsObject>({
@@ -365,7 +372,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -484,7 +491,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -517,7 +524,7 @@ onMounted(() => {
               <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
               round
               color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
index 3f441792b..95e5ae085 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -46,6 +46,13 @@ const modeViewPlan = ref<string>("table"); //การแสดงผล Table,C
 const modalHistory = ref<boolean>(false); //แสดง popup ประวัติแก้ไข
 const kpiDevelopmentId = ref<string>(""); // id การพัฒนารายบุคคล
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const totalIdp = ref<number>(0);
 const totalListIdp = ref<number>(1);
 const paginationIdp = ref({
@@ -580,7 +587,7 @@ onMounted(async () => {
         <div class="col-12">
           <div class="row items-center q-gutter-x-sm q-pb-sm">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               dense
               color="primary"
               icon="add"
@@ -703,7 +710,7 @@ onMounted(async () => {
                     >
                   </q-btn>
                   <q-btn
-                    v-if="checkPermission($route)?.attrIsUpdate"
+                    v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                     flat
                     dense
                     round
@@ -738,7 +745,7 @@ onMounted(async () => {
                       >
                     </q-btn>
                     <q-btn
-                      v-if="checkPermission($route)?.attrIsUpdate"
+                      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                       flat
                       round
                       color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/Main.vue b/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
index 728f985d7..94e482785 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/Main.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
+
 /** importComponents*/
 import ProfessionalLicense from "@/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue";
 import Train from "@/modules/04_registryPerson/components/detail/Achievement/02_Train.vue";
@@ -8,6 +10,8 @@ import Insignia from "@/modules/04_registryPerson/components/detail/Achievement/
 import DeclarationHonor from "@/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue";
 import ResultsPerformance from "@/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue";
 
+const storeRegistry = useRegistryNewDataStore();
+
 const tab = ref<string>("1");
 </script>
 <template>
@@ -41,22 +45,22 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <ProfessionalLicense />
+      <ProfessionalLicense :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="2">
-      <Train />
+      <Train :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="3">
-      <Insignia />
+      <Insignia :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="4">
-      <DeclarationHonor />
+      <DeclarationHonor :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="4">
       <PerformSpecialWork />
     </q-tab-panel>
     <q-tab-panel name="5">
-      <ResultsPerformance />
+      <ResultsPerformance :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index bf0cff16a..a94cfe8b4 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -33,6 +33,13 @@ const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 /** ข้อมูลลูกจ้างชั่วคราว*/
 const modalEdit = ref<boolean>(false);
 const dataEmployee = reactive<ResEmployee>({
@@ -296,7 +303,7 @@ onMounted(() => {
   <div class="row q-gutter-sm items-center">
     <div class="toptitle col text-right q-gutter-x-sm">
       <q-btn
-        v-if="checkPermission($route)?.attrIsUpdate"
+        v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
         flat
         round
         dense
diff --git a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
index 4a8a120bf..4ac2162b1 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -31,6 +31,13 @@ const {
 
 const profileId = ref<string>(route.params.id.toString());
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 /** ข้อมูลการจ้าง*/
 const rows = ref<Employment[]>([]);
 const filter = ref<string>("");
@@ -227,7 +234,7 @@ onMounted(() => {
   <div class="flex items-center">
     <div class="q-gutter-sm">
       <q-btn
-        v-if="checkPermission($route)?.attrIsUpdate"
+        v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
         size="12px"
         flat
         round
@@ -310,7 +317,7 @@ onMounted(() => {
               <q-tooltip>ประวัติข้อมูลการจ้าง </q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               dense
               flat
               round
@@ -321,7 +328,7 @@ onMounted(() => {
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsDelete"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsDelete"
               dense
               flat
               round
diff --git a/src/modules/04_registryPerson/components/detail/Employee/Main.vue b/src/modules/04_registryPerson/components/detail/Employee/Main.vue
index 0165fa1a7..d4c22f706 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/Main.vue
@@ -1,9 +1,13 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
+
 import DataEmployee from "@/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue";
 import Employment from "@/modules/04_registryPerson/components/detail/Employee/02_Employment.vue";
 
+const storeRegistry = useRegistryNewDataStore();
+
 const tab = ref<string>("1");
 </script>
 <template>
@@ -32,10 +36,10 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <DataEmployee />
+      <DataEmployee :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="2">
-      <Employment />
+      <Employment :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index b83ef1dd9..d86a5b9dc 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -30,6 +30,12 @@ const {
   pathRegistryEmp,
 } = mixin;
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const profileId = ref<string>(route.params.id.toString());
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 /** ตัวแปรข้อมูลหลัก */
@@ -292,7 +298,7 @@ onMounted(() => {
     <q-space />
     <div class="q-gutter-x-sm">
       <q-btn
-        v-if="checkPermission($route)?.attrIsUpdate"
+        v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
         flat
         dense
         round
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
index 87fc34f4e..c2b5aa845 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -36,6 +36,13 @@ const profileId = ref<string>(
 );
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 //ฟอร์มข้อมูลวินัย
 const disciplineData = reactive<RequestItemsObject>({
   date: null, //วัน/เดือน/ปี
@@ -344,7 +351,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -465,7 +472,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -499,7 +506,7 @@ onMounted(() => {
                 ><q-tooltip>ประวิติแก้ไขวินัย</q-tooltip></q-btn
               >
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
+                v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                 color="edit"
                 icon="edit"
                 flat
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
index 28bc05579..0c9e9a564 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@@ -24,7 +24,12 @@ const modal = defineModel<boolean>("modal", { required: true }); //แสดง
 const id = defineModel<string>("id", { required: true }); //id วินัยที่ต้องการดูประวัติแก้ไขวินัย
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
-
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const filterKeyword = ref<string>(""); //คำค้นหา
 const rows = ref<RequestItemsObject[]>([]); //รายการประวัติแก้ไขวินัย
 const columns = ref<QTableProps["columns"]>([
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
index 507af025c..028a34a85 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -22,6 +22,12 @@ import type {
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue";
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const route = useRoute();
 
 const $q = useQuasar();
@@ -443,7 +449,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -562,7 +568,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -607,7 +613,7 @@ onMounted(() => {
                 ><q-tooltip>ประวิติแก้ไขการลา</q-tooltip></q-btn
               >
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
+                v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                 color="edit"
                 icon="edit"
                 flat
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
index 6b45574fd..672b56b7f 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
@@ -26,6 +26,12 @@ const { showLoader, hideLoader, messageError, date2Thai, pathRegistryEmp } =
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const filterKeyword = ref<string>("");
 const rows = ref<DetailData[]>([]); //data history
 const formFilter = reactive<FormFilter>({
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index 890841454..847ba2a41 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -32,6 +32,12 @@ const profileId = ref<string>(
 );
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const id = ref<string>(""); //id ที่ต้องการแก้ไข
 const modal = ref<boolean>(false); //แสดง popup ข้อมูลปฏิบัติราชการพิเศษ
 const modalHistory = ref<boolean>(false); //แสดง popup ประวัติการแก้ไขข้อมูลปฏิบัติราชการพิเศษ
@@ -268,7 +274,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -388,7 +394,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -422,7 +428,7 @@ onMounted(() => {
                 ><q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
               </q-btn>
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
+                v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                 color="edit"
                 icon="edit"
                 flat
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
index 262064e2c..0eea02f99 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@@ -21,6 +21,12 @@ const { showLoader, hideLoader, messageError, date2Thai, pathRegistryEmp } =
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const filterKeyword = ref<string>(""); //คำค้นหา
 const rows = ref<ResponseObject[]>([]); //data history
 const columns = ref<QTableProps["columns"]>([
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
index d302a5c6a..cb571d909 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
@@ -7,7 +7,10 @@ import Discipline from "@/modules/04_registryPerson/components/detail/Government
 import Leave from "@/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue"; //การลา
 import PerformSpecialWork from "@/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue"; //ปฏิบัติราชการพิเศษ
 
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
+
 const tab = ref<string>("1");
+const storeRegistry = useRegistryNewDataStore();
 </script>
 <template>
   <div class="row items-center q-my-md">
@@ -37,16 +40,16 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <Info />
+      <Info :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="2">
-      <Discipline />
+      <Discipline :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="3">
-      <Leave />
+      <Leave :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="4">
-      <PerformSpecialWork />
+      <PerformSpecialWork :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
index 323b24a02..c46f0d424 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -28,6 +28,13 @@ const {
 
 const id = ref<string>("");
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -202,7 +209,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -320,7 +327,7 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -353,7 +360,7 @@ onMounted(() => {
                 ><q-tooltip>ประวิติแก้ไขอื่นๆ</q-tooltip></q-btn
               >
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
+                v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
                 color="edit"
                 icon="edit"
                 flat
diff --git a/src/modules/04_registryPerson/components/detail/Other/02_Document.vue b/src/modules/04_registryPerson/components/detail/Other/02_Document.vue
index 0e8fb1e63..cb5e03109 100644
--- a/src/modules/04_registryPerson/components/detail/Other/02_Document.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/02_Document.vue
@@ -23,6 +23,13 @@ const {
   dialogRemove,
 } = mixin;
 
+/**
+ * props
+ */
+const props = defineProps({
+  isLeave: Boolean,
+});
+
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -186,7 +193,7 @@ onMounted(() => {
     <div class="row col-12 q-col-gutter-y-sm q-pa-sm">
       <div class="col-12 row">
         <q-file
-          v-if="checkPermission($route)?.attrIsUpdate"
+          v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
           for="inputFiles"
           class="col-12"
           outlined
@@ -241,6 +248,7 @@ onMounted(() => {
                 ><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
               >
               <q-btn
+                v-if="props.isLeave == false"
                 size="12px"
                 flat
                 round
diff --git a/src/modules/04_registryPerson/components/detail/Other/Main.vue b/src/modules/04_registryPerson/components/detail/Other/Main.vue
index f93f69f71..e4cb50ef5 100644
--- a/src/modules/04_registryPerson/components/detail/Other/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/Main.vue
@@ -1,10 +1,14 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
+
 /** importComponents*/
 import OtherInformation from "@/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue";
 import Documentipline from "@/modules/04_registryPerson/components/detail/Other/02_Document.vue";
 
+const storeRegistry = useRegistryNewDataStore();
+
 const tab = ref<string>("1");
 </script>
 <template>
@@ -33,10 +37,10 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <OtherInformation />
+      <OtherInformation :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
     <q-tab-panel name="2">
-      <Documentipline />
+      <Documentipline :is-leave="storeRegistry.isLeave" />
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 73c137d78..edb0cb66c 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -43,6 +43,7 @@ const {
  */
 const props = defineProps({
   fetchDataPersonal: { type: Function, require: true },
+  isLeave:Boolean
 });
 
 const profileId = ref<string>(
@@ -445,7 +446,7 @@ onMounted(() => {
   <div class="row q-gutter-sm items-center">
     <div class="toptitle col text-right">
       <q-btn
-        v-if="checkPermission($route)?.attrIsUpdate"
+        v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
         flat
         round
         dense
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 163640057..bf6fabf68 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -46,6 +46,7 @@ const {
  */
 const props = defineProps({
   fetchDataPersonal: { type: Function, require: true },
+  isLeave:Boolean
 });
 
 const profileId = ref<string>(route.params.id.toString()); //id Profile
@@ -450,7 +451,7 @@ onMounted(async () => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       round
       flat
       color="primary"
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
index 48e45663e..bdfed4262 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@@ -37,6 +37,13 @@ const {
   pathRegistryEmp,
 } = mixin;
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -526,7 +533,7 @@ onMounted(async () => {
   <div class="row q-gutter-sm items-center">
     <div class="toptitle col text-right">
       <q-btn
-        v-if="checkPermission($route)?.attrIsUpdate"
+        v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
         flat
         round
         dense
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
index 599e2109b..b09b6c2f9 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -32,6 +32,12 @@ const {
   pathRegistryEmp,
 } = useCounterMixin();
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
 const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
@@ -505,7 +511,7 @@ onMounted(async () => {
         </q-toolbar-title>
         <div class="row q-col-gutter-sm">
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
             round
             flat
             color="edit"
@@ -579,7 +585,7 @@ onMounted(async () => {
         </q-toolbar-title>
         <div class="row q-col-gutter-sm">
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
             round
             flat
             color="edit"
@@ -653,7 +659,7 @@ onMounted(async () => {
             • คู่สมรส
           </div>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
             round
             flat
             dense
@@ -752,7 +758,7 @@ onMounted(async () => {
         <div class="row q-col-gutter-sm">
           <div class="text-weight-bold text-primary text-subtitle1">• บุตร</div>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
             round
             flat
             dense
@@ -775,7 +781,7 @@ onMounted(async () => {
             <q-space />
             <div class="row q-col-gutter-sm">
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
+                v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
                 round
                 flat
                 color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
index d565fc00c..542695b65 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -39,7 +39,12 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 const dialog = ref<boolean>(false); //แสดง popup ข้อมูลประวัติการศึกษา
 const dialogStatus = ref<string>("create"); //สถานะข้อมูลประวัติการศึกษา
 const mode = ref<string>("table"); //การแสดงของ Table card
-
+/**
+ * props
+ */
+const props = defineProps({
+  isLeave: Boolean,
+});
 //Table
 const rows = ref<ResponseObject[]>([]);
 const columns = ref<QTableProps["columns"]>([
@@ -618,7 +623,7 @@ function closeDialog() {
  */
 function closeHistoryDialog() {
   historyDialog.value = false;
-  historyRows.value = []
+  historyRows.value = [];
 }
 
 /**
@@ -747,7 +752,7 @@ onMounted(async () => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       round
       flat
       dense
@@ -858,7 +863,7 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -899,6 +904,7 @@ onMounted(async () => {
               <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
             </q-btn>
             <q-btn
+              v-if="props.isLeave == false"
               dense
               flat
               round
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
index ab22a4fe6..ac37819b6 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -32,7 +32,12 @@ const id = ref<string>(route.params.id.toString()); //id profile
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
 const mode = ref<string>("table"); //การแสดงของ Table card
-
+/**
+ * props
+ */
+const props = defineProps({
+  isLeave: Boolean,
+});
 //Table
 const keyword = ref<string>(""); //คำต้นหา
 const rows = ref<ResponseObject[]>([]); //รายการความสามารถ
@@ -347,7 +352,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       flat
       round
       color="primary"
@@ -451,7 +456,9 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="
+              props.isLeave == false && checkPermission($route)?.attrIsUpdate
+            "
             flat
             dense
             round
@@ -491,6 +498,7 @@ onMounted(() => {
               <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ</q-tooltip>
             </q-btn>
             <q-btn
+              v-if="props.isLeave == false"
               dense
               flat
               round
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue
index e2a86d13d..bd52fac75 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
+
 /** importComponents*/
 import Profile from "@/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue"; //ประวัติส่วนตัว
 import NameChangeHistory from "@/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue"; //ประวัติการเปลี่ยนชื่อ
@@ -9,6 +11,8 @@ import FamilyNew from "@/modules/04_registryPerson/components/detail/PersonalInf
 import Education from "@/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue"; //ประวัติการศึกษา
 import SpecialSkill from "@/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue"; //ความสามารถพิเศษ
 
+const storeRegistry = useRegistryNewDataStore();
+
 const tab = ref<string>("1");
 const props = defineProps({
   fetchDataPersonal: { type: Function, require: true },
@@ -45,22 +49,28 @@ const props = defineProps({
 
     <q-tab-panels v-model="tab" animated>
       <q-tab-panel name="1">
-        <Profile :fetchDataPersonal="props.fetchDataPersonal" />
+        <Profile
+          :fetchDataPersonal="props.fetchDataPersonal"
+          :is-leave="storeRegistry.isLeave"
+        />
       </q-tab-panel>
       <q-tab-panel name="2">
-        <NameChangeHistory :fetchDataPersonal="props.fetchDataPersonal" />
+        <NameChangeHistory
+          :fetchDataPersonal="props.fetchDataPersonal"
+          :is-leave="storeRegistry.isLeave"
+        />
       </q-tab-panel>
       <q-tab-panel name="3">
-        <Address />
+        <Address :is-leave="storeRegistry.isLeave" />
       </q-tab-panel>
       <q-tab-panel name="4">
-        <FamilyNew />
+        <FamilyNew :is-leave="storeRegistry.isLeave" />
       </q-tab-panel>
       <q-tab-panel name="5">
-        <Education />
+        <Education :is-leave="storeRegistry.isLeave" />
       </q-tab-panel>
       <q-tab-panel name="6">
-        <SpecialSkill />
+        <SpecialSkill :is-leave="storeRegistry.isLeave" />
       </q-tab-panel>
     </q-tab-panels>
   </q-card>
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index ea5e72e90..a8d997fbc 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -31,6 +31,13 @@ const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
 
+/**
+ * props
+ */
+const props = defineProps({
+  isLeave: Boolean,
+});
+
 const store = useSalaryDataStore();
 const {
   date2Thai,
@@ -611,7 +618,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="!props.isLeave && checkPermission($route)?.attrIsUpdate"
       flat
       color="primary"
       round
@@ -666,7 +673,6 @@ onMounted(() => {
     <template v-slot:header="props">
       <q-tr :props="props">
         <q-th auto-width />
-        <q-th v-if="checkPermission($route)?.attrIsUpdate" auto-width />
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
@@ -687,7 +693,7 @@ onMounted(() => {
           </q-btn>
 
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -698,9 +704,8 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-        </q-td>
-        <q-td v-if="checkPermission($route)?.attrIsUpdate">
           <q-btn
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             dense
             flat
             round
@@ -712,6 +717,7 @@ onMounted(() => {
           </q-btn>
 
           <q-btn
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             dense
             flat
             round
@@ -722,6 +728,7 @@ onMounted(() => {
           >
           </q-btn>
         </q-td>
+
         <q-td v-for="col in props.cols" :key="col.id">
           <div class="table_ellipsis">
             {{ col.value ? col.value : "-" }}
diff --git a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
index a9bc6a142..a54135989 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -33,6 +33,13 @@ const profileId = ref<string>(
 );
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 
+/**
+ * props
+ */
+ const props = defineProps({
+  isLeave:Boolean
+});
+
 const modelView = ref<string>("table"); //การแสดงผล Table,Card
 const modalDialog = ref<boolean>(false); //แสดง popup บันทึกวันที่ไม่ได้รับเงินเดือนฯ
 const modalHistory = ref<boolean>(false); //แสดง popup ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ
@@ -237,7 +244,7 @@ onMounted(() => {
 <template>
   <div class="row items-center q-gutter-x-sm q-pb-sm">
     <q-btn
-      v-if="checkPermission($route)?.attrIsUpdate"
+      v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
       dense
       color="primary"
       icon="add"
@@ -356,7 +363,7 @@ onMounted(() => {
             <q-tooltip>ประวัติบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
@@ -388,7 +395,7 @@ onMounted(() => {
               <q-tooltip>ประวัติบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
+              v-if="props.isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
               round
               color="edit"
diff --git a/src/modules/04_registryPerson/components/detail/Salary/Main.vue b/src/modules/04_registryPerson/components/detail/Salary/Main.vue
index dfdbf8ceb..709f60df4 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/Main.vue
@@ -1,10 +1,14 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
+import { useRegistryNewDataStore } from '@/modules/04_registryPerson/store'
+
 /** importComponents*/
 import PositionSalary from "@/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue"; //ตำแหน่งเงินเดือน
 import NotReceiveSalary from "@/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue"; //วันที่ไม่ได้รับเงินเดิอน
 
+const storeRegistry = useRegistryNewDataStore()
+
 const tab = ref<string>("1");
 </script>
 <template>
@@ -33,10 +37,10 @@ const tab = ref<string>("1");
 
   <q-tab-panels v-model="tab" animated>
     <q-tab-panel name="1">
-      <PositionSalary />
+      <PositionSalary :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
     <q-tab-panel name="2">
-      <NotReceiveSalary />
+      <NotReceiveSalary :is-leave="storeRegistry.isLeave"/>
     </q-tab-panel>
   </q-tab-panels>
 </template>
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 3b4a67fd0..a8a8398ce 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -25,6 +25,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
   const posLevelOps = ref<DataOption[]>([]);
   const yearOps = ref<DataOption[]>([]);
   const mode = ref<string>("table");
+  const isLeave = ref<boolean>(false)
 
   function fetchType(data: DataType[]) {
     posTypeMain.value = data;
@@ -87,5 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     mode,
     formFilter,
     labelOption,
+    isLeave
   };
 });
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 802fb1f6e..9230d82b9 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -9,6 +9,7 @@ import {
   checkPermissionList,
 } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import axios from "axios";
@@ -37,6 +38,7 @@ import TabMain from "@/modules/04_registryPerson/components/detail/TabMain.vue";
 const $q = useQuasar();
 const router = useRouter();
 const route = useRoute();
+const storeRegistry = useRegistryNewDataStore();
 const {
   dialogRemove,
   dialogConfirm,
@@ -269,6 +271,7 @@ async function fetchDataPersonal() {
     .get(config.API.registryNewByProfileId(profileId.value, empType.value))
     .then(async (res) => {
       formDetail.value = res.data.result;
+      storeRegistry.isLeave = res.data.result.isLeave;
 
       if (res.data.result.leaveReason) {
         // เหตุผลพ้นจากราชการต่อท้ายชื่อ
@@ -686,6 +689,7 @@ onMounted(async () => {
       <!-- list menu ของข้าราชการฯ -->
       <q-btn-dropdown
         v-if="
+          !storeRegistry.isLeave &&
           empType === '' &&
           checkPermissionList([
             'SYS_TEMPDUTY',
@@ -733,6 +737,7 @@ onMounted(async () => {
       <!-- list menu ของลูกจ้างประจำ -->
       <q-btn-dropdown
         v-if="
+          !storeRegistry.isLeave &&
           empType === '-employee' &&
           checkPermissionList(['SYS_PROMOTION_EMP', 'SYS_PASSAWAY'])
         "
@@ -828,7 +833,7 @@ onMounted(async () => {
             <q-img :src="profilePicture" />
           </q-avatar>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
+            v-if="!storeRegistry.isLeave && checkPermission($route)?.attrIsUpdate"
             round
             text-color="edit"
             icon="mdi-pencil"