From 3cdbba6cc04c5d30fcf3e746232ef522cbf53411 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 13 Feb 2026 16:34:07 +0700
Subject: [PATCH 1/7] feat:add btn delete

---
 .../02_NameChangeHistory.vue                  | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

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 b14ba2225..9486b6426 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -35,6 +35,7 @@ const {
   hideLoader,
   pathRegistryEmp,
   onSearchDataTable,
+  dialogRemove,
 } = useCounterMixin();
 
 /** props*/
@@ -189,8 +190,8 @@ async function fetchData(id: string) {
   await http
     .get(config.API.profileNewChangeNameByProfileId(id, empType.value))
     .then(async (res) => {
-      rows.value = await res.data.result;
       rowsMain.value = await res.data.result;
+      searchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -358,7 +359,7 @@ function closeDialog() {
 }
 
 /** ฟังก์ค้นหาข้อมูลรายการประวัติการเปลีียนชื่อ-นามสกุล*/
-function serchDataTable() {
+function searchDataTable() {
   rows.value = onSearchDataTable(
     filterSearch.value,
     rowsMain.value,
@@ -366,6 +367,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.รอAPI + `/${id}`);
+  //     await fetchData(profileId.value);
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ดูการเปลี่ยนแปลงของข้อมูลฟอร์ท เปลี่ยนชื่อ-นามสกุล*/
 watch(
   () => [
@@ -450,7 +466,7 @@ onMounted(async () => {
       label="ค้นหา"
       class="q-mr-sm"
       v-model="filterSearch"
-      @keydown.enter.prevent="serchDataTable"
+      @keydown.enter.prevent="searchDataTable"
     >
       <template v-slot:append>
         <q-icon name="search" />
@@ -486,6 +502,7 @@ onMounted(async () => {
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th 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>
@@ -495,6 +512,19 @@ onMounted(async () => {
 
     <template v-slot:body="props">
       <q-tr :props="props">
+        <q-td auto-width>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
+        </q-td>
         <q-td
           v-for="(col, index) in props.cols"
           :key="col.name"

From 41c11f691341c2e050f1f810d73eb1051d4f8834 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 13 Feb 2026 16:57:12 +0700
Subject: [PATCH 2/7] feat: add btn delete PersonalInformation

---
 .../02_NameChangeHistory.vue                  |  2 +-
 .../PersonalInformation/04_FamilyNew.vue      | 30 +++++++++++++++++--
 .../PersonalInformation/05_Education.vue      | 27 +++++++++++++++++
 .../PersonalInformation/06_SpecialSkill.vue   | 29 +++++++++++++++++-
 4 files changed, 84 insertions(+), 4 deletions(-)

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 9486b6426..69999ffe6 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -371,7 +371,7 @@ function handleDelete(id: string) {
   // dialogRemove($q, async () => {
   //   showLoader();
   //   try {
-  //     await http.delete(config.API.รอAPI + `/${id}`);
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
   //     await fetchData(profileId.value);
   //     success($q, "ลบข้อมูลสำเร็จ");
   //   } catch (err) {
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 ab1b1b075..cebc64b3f 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -375,8 +375,6 @@ function onOpenDialogForm(
   isStatusEdit: boolean = false,
   data: any = undefined
 ) {
-  console.log(data);
-
   modal.value = true;
   typeForm.value = type;
   isEdit.value = isStatusEdit;
@@ -509,6 +507,21 @@ async function fetchDataHistory() {
   }
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //     await fetchDataCouple();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(async () => {
   showLoader();
@@ -830,6 +843,19 @@ onMounted(async () => {
               >
                 <q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
               >
+
+              <q-btn
+                v-if="checkPermission($route)?.attrIsDelete"
+                color="red"
+                flat
+                dense
+                round
+                icon="delete"
+                @click="handleDelete(item.id)"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+
               <q-btn
                 round
                 flat
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 d2c8fe133..938e175ad 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -576,6 +576,21 @@ async function fetchDataHistory() {
   }
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //     await fetchData(profileId.value);
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ฟังก์ค้นหาข้อมูลรายการประวัติการศึกษา */
 function serchDataTable() {
   rows.value = onSearchDataTable(
@@ -736,6 +751,18 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
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 b258b2267..f5f67a067 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -252,8 +252,8 @@ async function fetchData(id: string) {
   await http
     .get(config.API.profileNewAbilityByProfileId(id, empType.value))
     .then(async (res) => {
-      rows.value = await res.data.result;
       rowsMain.value = await res.data.result;
+      serchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -403,6 +403,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  //     await  fetchData(id.value);
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchData(id.value);
@@ -529,6 +544,18 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"

From ef0f879cf8a57312703abc90a93aae6b335aaaad Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 13 Feb 2026 19:21:01 +0700
Subject: [PATCH 3/7] feat(gov):btn delete

---
 .../GovernmentInformation/02_Discipline.vue   | 29 +++++++++++++++--
 .../detail/GovernmentInformation/03_Leave.vue | 32 +++++++++++++++++--
 .../04_PerformSpecialWork.vue                 | 29 ++++++++++++++++-
 .../06_HelpGovernment.vue                     | 27 ++++++++++++++++
 4 files changed, 112 insertions(+), 5 deletions(-)

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 3ee03f658..5bfabacf3 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive } from "vue";
 import { useQuasar } from "quasar";
-import axios from "axios";
 
 import { useRoute } from "vue-router";
 import { checkPermission } from "@/utils/permissions";
@@ -290,8 +289,8 @@ async function fetchData(id: string) {
   http
     .get(config.API.profileNewDisciplineByProfileId(id, empType.value))
     .then((res) => {
-      rows.value = res.data.result;
       rowsMain.value = res.data.result;
+      serchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -461,6 +460,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //   await fetchData(profileId.value);
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchData(profileId.value);
@@ -587,6 +601,17 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
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 e8bc6789d..d54610eda 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -208,7 +208,7 @@ async function getData() {
     .get(config.API.profileNewLeaveById(profileId.value, empType.value))
     .then(async (res) => {
       const data = await res.data.result;
-      rows.value = data.map((item: DataLeave) => ({
+      const baseData = data.map((item: DataLeave) => ({
         ...item,
         id: item.id,
         typeLeave: item.leaveType.name,
@@ -218,7 +218,9 @@ async function getData() {
         numLeave: item.leaveDays,
         typeLeaveId: item.leaveTypeId,
       }));
-      rowsMain.value = rows.value;
+      rowsMain.value = baseData;
+
+      serchDataTable();
     })
     .catch((e) => {
       messageError($q, e);
@@ -474,6 +476,21 @@ function clickEditRowType() {
   }
 }
 
+function f(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //     await getData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   getData();
@@ -597,6 +614,17 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
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 c80c87a42..f81d07ba2 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -192,8 +192,8 @@ async function fetchData(id: string) {
   await http
     .get(config.API.profileNewDutyByProfileId(id, empType.value))
     .then(async (res) => {
-      rows.value = await res.data.result;
       rowsMain.value = await res.data.result;
+      serchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -447,6 +447,22 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //    await fetchData(profileId.value);
+  //
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งา*/
 onMounted(() => {
   fetchData(profileId.value);
@@ -571,6 +587,17 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index 47eba38f8..08dbbca94 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -438,6 +438,21 @@ async function onReturner(refId: string) {
     });
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //     await fetchData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 onMounted(() => {
   fetchData();
 });
@@ -583,6 +598,18 @@ onMounted(() => {
           >
             <q-tooltip>ส่งตัวกลับ</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsDelete && !props.row.commandId"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
           <div

From da79633e85f94837ba78b3f02bdf61ba8d160994 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Feb 2026 14:40:59 +0700
Subject: [PATCH 4/7] feat(registry): add delete button for achievements

---
 .../Achievement/01_ProfessionalLicense.vue    | 37 ++++++++++++++
 .../detail/Achievement/02_Train.vue           | 14 ++++--
 .../detail/Achievement/03_Insignia.vue        | 41 ++++++++++++++-
 .../Achievement/04_DeclarationHonor.vue       | 41 ++++++++++++++-
 .../Achievement/05_ResultsPerformance.vue     | 50 ++++++++++++++++++-
 5 files changed, 177 insertions(+), 6 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 46c8b1076..2e204649a 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -360,6 +360,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  //   await fetchData(id.value);
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  */
@@ -495,6 +510,17 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
@@ -552,6 +578,17 @@ onMounted(() => {
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 cebac03a3..dcb513021 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -356,8 +356,8 @@ async function fetchData(id: string) {
   await http
     .get(config.API.profileNewTrainingByProfileId(id, empType.value))
     .then(async (res) => {
-      rows.value = await res.data.result;
       rowsMain.value = await res.data.result;
+      serchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -567,7 +567,11 @@ onMounted(() => {
           </q-btn>
 
           <q-btn
-            v-if="isLeave == false && checkPermission($route)?.attrIsDelete"
+            v-if="
+              isLeave == false &&
+              checkPermission($route)?.attrIsDelete &&
+              !props.row.developmentId
+            "
             flat
             dense
             round
@@ -614,7 +618,11 @@ onMounted(() => {
             </q-btn>
 
             <q-btn
-              v-if="isLeave == false && checkPermission($route)?.attrIsDelete"
+              v-if="
+                isLeave == false &&
+                checkPermission($route)?.attrIsDelete &&
+                !props.row.developmentId
+              "
               flat
               round
               color="red"
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 e0e465e7d..79625fc77 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -317,8 +317,8 @@ async function fetchData() {
     const res = await http.get(
       config.API.profileNewInsignByProfileId(profileId.value, empType.value)
     );
-    rows.value = res.data.result;
     rowsMain.value = res.data.result;
+    serchDataTable();
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -646,6 +646,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  //    await fetchData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(async () => {
   await fetchData();
@@ -773,6 +788,18 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="isLeave == false && checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
@@ -824,6 +851,7 @@ onMounted(async () => {
             >
               <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
             </q-btn>
+
             <q-btn
               v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               flat
@@ -834,6 +862,17 @@ onMounted(async () => {
             >
               <q-tooltip>แก่ไขข้อมุล</q-tooltip>
             </q-btn>
+
+            <q-btn
+              v-if="isLeave == false && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 290145b0a..5305e053a 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -203,8 +203,8 @@ async function fetchData() {
     const res = await http.get(
       config.API.profileNewHonorByProfileId(profileId.value, empType.value)
     );
-    rows.value = res.data.result;
     rowsMain.value = res.data.result;
+    serchDataTable();
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -445,6 +445,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  // await   fetchData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchData();
@@ -567,6 +582,18 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
@@ -628,6 +655,18 @@ onMounted(() => {
             >
               <q-tooltip>แก่ไขข้อมุล</q-tooltip>
             </q-btn>
+
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 3b7a9fe66..fb1bc8369 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -356,8 +356,9 @@ async function fetchData() {
         empType.value
       )
     );
-    rows.value = res.data.result;
+
     rowsMain.value = res.data.result;
+    serchDataTable();
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -517,6 +518,10 @@ function serchDataTable() {
   );
 }
 
+/**
+ * ลบข้อมูลการพัฒนารายบุคคล (Individual Development Plan)
+ * @param rowId  ที่ต้องการลบข้อมูล
+ */
 function onDelete(rowId: string) {
   dialogRemove($q, async () => {
     showLoader();
@@ -532,6 +537,25 @@ function onDelete(rowId: string) {
   });
 }
 
+/**
+ * ผลการประเมินการปฏิบัติราชการ
+ * @param rowId ที่ต้องการลบข้อมูล
+ */
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  // await   fetchData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 onMounted(async () => {
   await fetchData();
   empType.value !== "-temp" && (await getDevelop());
@@ -668,6 +692,18 @@ onMounted(async () => {
                   >
                     <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                   </q-btn>
+
+                  <q-btn
+                    v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+                    color="red"
+                    flat
+                    dense
+                    round
+                    icon="delete"
+                    @click="handleDelete(props.row.id)"
+                  >
+                    <q-tooltip>ลบข้อมูล</q-tooltip>
+                  </q-btn>
                 </q-td>
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div class="table_ellipsis">
@@ -705,6 +741,18 @@ onMounted(async () => {
                     >
                       <q-tooltip>แก้ไขข้อมุล</q-tooltip>
                     </q-btn>
+
+                    <q-btn
+                      v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+                      color="red"
+                      flat
+                      dense
+                      round
+                      icon="delete"
+                      @click="handleDelete(props.row.id)"
+                    >
+                      <q-tooltip>ลบข้อมูล</q-tooltip>
+                    </q-btn>
                   </q-card-actions>
                   <q-separator />
                   <q-list>

From 505a932b887ecbcbfbc52137011b0db8944edae9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Feb 2026 14:43:17 +0700
Subject: [PATCH 5/7] fix(registry): add delete button for other

---
 .../detail/Other/01_OtherInformation.vue      | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

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 fa52d4272..d217c213f 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -126,8 +126,8 @@ async function getData() {
   await http
     .get(config.API.profileNewOtherByProfileId(profileId.value, empType.value))
     .then((res) => {
-      rows.value = res.data.result;
       rowsMain.value = res.data.result;
+      serchDataTable();
     })
     .catch((e) => {
       messageError($q, e);
@@ -242,6 +242,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(rowId: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
+  // await   getData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 onMounted(() => {
   getData();
 });
@@ -361,6 +376,18 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
@@ -383,8 +410,9 @@ onMounted(() => {
               flat
               round
               @click="openDialogHistory(props.row.id)"
-              ><q-tooltip>ประวิติแก้ไขอื่นๆ</q-tooltip></q-btn
             >
+              <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
+            </q-btn>
             <q-btn
               v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               color="edit"
@@ -392,8 +420,20 @@ onMounted(() => {
               flat
               round
               @click="openDialogEdit(props.row)"
-              ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
             >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
 
           <q-separator />

From 04a76b30258a881beeaace2df51f2a21e15c2825 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Feb 2026 15:05:07 +0700
Subject: [PATCH 6/7] fix(registry): add delete button for  Table Card

---
 .../detail/Achievement/03_Insignia.vue        |  2 +-
 .../Achievement/04_DeclarationHonor.vue       |  4 +-
 .../detail/Employee/02_Employment.vue         |  2 +-
 .../GovernmentInformation/02_Discipline.vue   | 21 +++++++--
 .../detail/GovernmentInformation/03_Leave.vue | 21 +++++++--
 .../04_PerformSpecialWork.vue                 | 21 +++++++--
 .../06_HelpGovernment.vue                     | 24 ++++++++++-
 .../GovernmentInformation/07_Position.vue     |  2 +-
 .../detail/Other/01_OtherInformation.vue      |  2 +-
 .../detail/PersonalInformation/01_Profile.vue |  2 +-
 .../PersonalInformation/04_FamilyNew.vue      |  2 +-
 .../PersonalInformation/05_Education.vue      | 16 ++++++-
 .../PersonalInformation/06_SpecialSkill.vue   | 16 ++++++-
 .../detail/Salary/01_PositionSalary.vue       |  2 +-
 .../detail/Salary/02_NotReceiveSalary.vue     | 43 ++++++++++++++++++-
 15 files changed, 151 insertions(+), 29 deletions(-)

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 79625fc77..5425f40b0 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -860,7 +860,7 @@ onMounted(async () => {
               icon="edit"
               @click="onClickOpenDialog(true, props.row)"
             >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
 
             <q-btn
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 5305e053a..d424c3fc1 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -214,7 +214,7 @@ async function fetchData() {
 
 /**
  * บันทึกข้อมูลประกาศเกียรติคุณ
- * @param editStatus แก่ไข,เพิ่ม
+ * @param editStatus แก้ไข,เพิ่ม
  */
 async function addEditData(editStatus: boolean = false) {
   if (!profileId.value) return;
@@ -653,7 +653,7 @@ onMounted(() => {
               icon="edit"
               @click="onClickOpenDialog(true, props.row)"
             >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
 
             <q-btn
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 0a745c916..2168cd5ee 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -159,7 +159,7 @@ function fetchDataEmployment(id: string) {
 
 /**
  * function เปิด dialog Form ข้อมูลการจ้าง
- * @param statusEdit สถานะการ สร้าง หรือ แก่ไข
+ * @param statusEdit สถานะการ สร้าง หรือ แก้ไข
  * @param id รายการการจ้าง
  */
 function onOpenDialog(statusEdit: boolean = false, id: string = "") {
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 5bfabacf3..d7d83e5bb 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -434,7 +434,7 @@ function openDialogHistory(idOrder: string) {
   id.value = idOrder;
 }
 
-/** fetch ข้อมูลประวัติการแก่ไขข้อมูลวินัย*/
+/** fetch ข้อมูลประวัติการแก้ไขข้อมูลวินัย*/
 async function fetchDataHistory() {
   showLoader();
 
@@ -602,7 +602,7 @@ onMounted(() => {
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete"
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -658,8 +658,9 @@ onMounted(() => {
               flat
               round
               @click="openDialogHistory(props.row.id)"
-              ><q-tooltip>ประวิติแก้ไขวินัย</q-tooltip></q-btn
             >
+              <q-tooltip>ประวิติแก้ไขวินัย</q-tooltip>
+            </q-btn>
             <q-btn
               v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               color="edit"
@@ -667,8 +668,20 @@ onMounted(() => {
               flat
               round
               @click="openDialogEdit(props.row)"
-              ><q-tooltip>แก้ไข</q-tooltip></q-btn
             >
+              <q-tooltip>แก้ไข</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 d54610eda..65800bf1f 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -476,7 +476,7 @@ function clickEditRowType() {
   }
 }
 
-function f(id: string) {
+function handleDelete(id: string) {
   // dialogRemove($q, async () => {
   //   showLoader();
   //   try {
@@ -615,7 +615,7 @@ onMounted(() => {
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete"
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -651,8 +651,9 @@ onMounted(() => {
               flat
               round
               @click="openDialogHistory(props.row.id)"
-              ><q-tooltip>ประวิติแก้ไขการลา</q-tooltip></q-btn
             >
+              <q-tooltip>ประวิติแก้ไขการลา</q-tooltip>
+            </q-btn>
             <q-btn
               v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               color="edit"
@@ -660,8 +661,20 @@ onMounted(() => {
               flat
               round
               @click="openDialogEdit(props.row)"
-              ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
             >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 f81d07ba2..1f20d23f0 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -51,7 +51,7 @@ const isLeave = defineModel<boolean>("isLeave", {
 const id = ref<string>(""); //id ที่ต้องการแก้ไข
 const modal = ref<boolean>(false); //แสดง popup ข้อมูลปฏิบัติราชการพิเศษ
 const modalHistory = ref<boolean>(false); //แสดง popup ประวัติการแก้ไขข้อมูลปฏิบัติราชการพิเศษ
-const edit = ref<boolean>(false); //สถานะการแก่ไข
+const edit = ref<boolean>(false); //สถานะการแก้ไข
 //ฟอร์มข้อมูลปฏิบัติราชการพิเศษ
 const dutyData = reactive<RequestItemsObject>({
   profileId: profileId.value,
@@ -588,7 +588,7 @@ onMounted(() => {
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete"
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -644,7 +644,8 @@ onMounted(() => {
               flat
               round
               @click="openDialogHistory(props.row.id)"
-              ><q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
+            >
+              <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
             </q-btn>
             <q-btn
               v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
@@ -653,7 +654,19 @@ onMounted(() => {
               flat
               round
               @click="openDialogEdit(props.row)"
-              ><q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-card-actions>
 
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index 08dbbca94..15f2a0f5d 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -224,8 +224,8 @@ async function fetchData() {
     .get(config.API.profileAssistance(empType.value, profileId.value))
     .then((res) => {
       const data = res.data.result;
-      rows.value = data;
       rowsMain.value = data;
+      serchDataTable();
     })
     .catch((err) => {
       messageError($q, err);
@@ -600,7 +600,11 @@ onMounted(() => {
           </q-btn>
 
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete && !props.row.commandId"
+            v-if="
+              !isLeave &&
+              checkPermission($route)?.attrIsDelete &&
+              !props.row.commandId
+            "
             color="red"
             flat
             dense
@@ -694,6 +698,22 @@ onMounted(() => {
             >
               <q-tooltip>ส่งตัวกลับ</q-tooltip>
             </q-btn>
+
+            <q-btn
+              v-if="
+                !isLeave &&
+                checkPermission($route)?.attrIsDelete &&
+                !props.row.commandId
+              "
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
 
           <q-separator />
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 33d3c77ee..67062edde 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -616,7 +616,7 @@ async function fetchDataTenure() {
 /**
  * function เลือกประเภทตำแหน่ง
  * @param val id ประเภทตำแหน่ง
- * @param status แก่ไข , เพิ่ม
+ * @param status แก้ไข , เพิ่ม
  */
 async function updateSelectType(val: string, status: boolean = false) {
   const listLevel = val
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 d217c213f..e27a81761 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -162,7 +162,7 @@ function openDialogHistory(idOrder: string) {
   modalHistory.value = true;
 }
 
-/** ฟังก์ชันดึงข้อมูลประวัติการแก่ไขข้อมูล*/
+/** ฟังก์ชันดึงข้อมูลประวัติการแก้ไขข้อมูล*/
 async function fetchDataHistory() {
   showLoader();
   try {
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 439bbd7c7..bf789c201 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -59,7 +59,7 @@ const modal = ref<boolean>(false); // แสดงฟอร์มแก้ไข
 const informaData = ref<ResponseObject>(); // ข้อมูลส่วนคัว
 const modalHistory = ref<boolean>(false); // แสดงช้อมูลรายการประวัติการแก้ไข
 const age = ref<string | null>(""); //อายุ
-const formData = reactive<RequestObject>(store.defaultProfile); //ฟอร์มข้อมูลการแก่้ไข
+const formData = reactive<RequestObject>(store.defaultProfile); //ฟอร์มข้อมูลการแก้ไข
 const emailVerify = ref<string | null>("");
 
 /** ข้อมูล Label*/
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 cebc64b3f..3eda0cf5b 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -367,7 +367,7 @@ function closeDialog() {
 /**
  * function แก้ไขข้อมูล
  * @param type  ประเภทของบุคคล
- * @param isStatusEdit สถานะแก่้ไข
+ * @param isStatusEdit สถานะแก้ไข
  * @param data ข้อมูลเดิม
  */
 function onOpenDialogForm(
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 938e175ad..793b17e1c 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -753,7 +753,7 @@ onMounted(async () => {
           </q-btn>
 
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete"
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -790,7 +790,7 @@ onMounted(async () => {
               <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="isLeave == false"
+              v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               dense
               flat
               round
@@ -800,6 +800,18 @@ onMounted(async () => {
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
+
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 f5f67a067..b9c7e5355 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -546,7 +546,7 @@ onMounted(() => {
           </q-btn>
 
           <q-btn
-            v-if="checkPermission($route)?.attrIsDelete"
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
             color="red"
             flat
             dense
@@ -605,7 +605,7 @@ onMounted(() => {
               <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ</q-tooltip>
             </q-btn>
             <q-btn
-              v-if="isLeave == false"
+              v-if="isLeave == false && checkPermission($route)?.attrIsUpdate"
               dense
               flat
               round
@@ -620,6 +620,18 @@ onMounted(() => {
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
+
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
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 3a7105c70..46e93dfbe 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -596,7 +596,7 @@ async function fetchDataOptionExecutive() {
 /**
  * function เลือกประเภทตำแหน่ง
  * @param val id ประเภทตำแหน่ง
- * @param status แก่ไข , เพิ่ม
+ * @param status แก้ไข , เพิ่ม
  */
 async function updateSelectType(val: string, status: boolean = false) {
   const listLevel = val
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 057479414..64756b5b1 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -295,8 +295,8 @@ async function getData() {
   await http
     .get(config.API.profileNewNoPaidByProfileId(profileId.value, empType.value))
     .then(async (res) => {
-      rows.value = await res.data.result;
       rowsMain.value = await res.data.result;
+      serchDataTable();
     })
     .catch((e) => {
       messageError($q, e);
@@ -335,6 +335,21 @@ function serchDataTable() {
   );
 }
 
+function handleDelete(id: string) {
+  // dialogRemove($q, async () => {
+  //   showLoader();
+  //   try {
+  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
+  //     await getData();
+  //     success($q, "ลบข้อมูลสำเร็จ");
+  //   } catch (err) {
+  //     messageError($q, err);
+  //   } finally {
+  //     hideLoader();
+  //   }
+  // });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน */
 onMounted(() => {
   getData();
@@ -460,6 +475,18 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+            color="red"
+            flat
+            dense
+            round
+            icon="delete"
+            @click="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
@@ -517,7 +544,19 @@ onMounted(() => {
               icon="edit"
               @click="onClickOpenDialog(true, props.row)"
             >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+              color="red"
+              flat
+              dense
+              round
+              icon="delete"
+              @click="handleDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-card-actions>
           <q-separator />

From 64489162ae3bf696aa63512d07024998ca6dd158 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Feb 2026 16:15:55 +0700
Subject: [PATCH 7/7] feat(registry): integrate delete API

---
 src/api/registry/api.registry.ts              | 39 ++++++++++++++++---
 .../Achievement/01_ProfessionalLicense.vue    | 27 +++++++------
 .../detail/Achievement/02_Train.vue           |  2 +-
 .../detail/Achievement/03_Insignia.vue        | 29 +++++++-------
 .../Achievement/04_DeclarationHonor.vue       | 27 +++++++------
 .../Achievement/05_ResultsPerformance.vue     | 30 +++++++-------
 .../GovernmentInformation/02_Discipline.vue   | 27 +++++++------
 .../detail/GovernmentInformation/03_Leave.vue | 27 +++++++------
 .../04_PerformSpecialWork.vue                 | 29 +++++++-------
 .../GovernmentInformation/05_ActingPos.vue    |  4 +-
 .../06_HelpGovernment.vue                     | 27 +++++++------
 .../detail/Other/01_OtherInformation.vue      | 27 +++++++------
 .../02_NameChangeHistory.vue                  | 26 +++++++------
 .../PersonalInformation/04_FamilyNew.vue      | 28 +++++++------
 .../PersonalInformation/05_Education.vue      | 29 +++++++-------
 .../PersonalInformation/06_SpecialSkill.vue   | 27 +++++++------
 .../detail/Salary/02_NotReceiveSalary.vue     | 27 +++++++------
 17 files changed, 252 insertions(+), 180 deletions(-)

diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 06e0a356a..0cbfc086e 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -39,11 +39,15 @@ export default {
     `${registryNew}${type}/nopaid/${dataId}`,
   profileNewNoPaidHisById: (dataId: string, type: string) =>
     `${registryNew}${type}/nopaid/history/${dataId}`,
+  profileNewNoPaidUpdateDelete: (type: string) =>
+    `${registryNew}${type}/nopaid/update-delete/`,
 
   // เครื่องราชฯ
   profileNewInsign: (type: string) => `${registryNew}${type}/insignia`,
   profileNewInsignByProfileId: (profileId: string, type: string) =>
     `${registryNew}${type}/insignia/${profileId}`,
+  profileNewInsignUpdateDelete: (type: string) =>
+    `${registryNew}${type}/insignia/update-delete/`,
 
   orgInsigniaActive: () => `${org}/insignia/insignia-type/active`,
 
@@ -60,6 +64,8 @@ export default {
     `${registryNew}${type}/honor/${dataId}`,
   profileNewHonorHisById: (dataId: string, type: string) =>
     `${registryNew}${type}/honor/admin/history/${dataId}`,
+  profileNewHonorUpdateDelete: (type: string) =>
+    `${registryNew}${type}/honor/update-delete/`,
 
   // ผลการประเมินการปฏิบัติราชการ
   profileNewAssessments: (type: string) => `${registryNew}${type}/assessments`,
@@ -69,9 +75,10 @@ export default {
     `${registryNew}${type}/assessments/${dataId}`,
   profileNewAssessmentsHisById: (dataId: string, type: string) =>
     `${registryNew}${type}/assessments/admin/history/${dataId}`,
-  profileDevelopmentUpdateDelete: `${registryNew}/development/update-delete/`,
-
-
+  profileDevelopmentUpdateDelete: (type: string) =>
+    `${registryNew}${type}/development/update-delete/`,
+  profileNewAssessmentsUpdateDelete: (type: string) =>
+    `${registryNew}${type}/assessments/update-delete/`,
   // การฝึกอบรม
   profileNewTraining: (type: string) => `${registryNew}${type}/training`,
   profileNewTrainingByProfileId: (profileId: string, type: string) =>
@@ -80,7 +87,8 @@ export default {
     `${registryNew}${type}/training/${trainingId}`,
   profileNewTrainingHisByTrainingId: (trainingId: string, type: string) =>
     `${registryNew}${type}/training/admin/history/${trainingId}`,
-  profileTrainingUpdate: `${registryNew}/training/update-delete/`,
+  profileTrainingUpdate: (type: string) =>
+    `${registryNew}${type}/training/update-delete/`,
 
   // ประวัติการศึกษา
   profileNewEducation: (type: string) => `${registryNew}${type}/educations`,
@@ -93,6 +101,8 @@ export default {
     `${registryNew}${type}/educations/${educationId}`,
   profileNewEducationHisByEducationId: (educationsId: string, type: string) =>
     `${registryNew}${type}/educations/admin/history/${educationsId}`,
+  profileEducationUpdateDelete: (type: string) =>
+    `${registryNew}${type}/educations/update-delete/`,
 
   // ความสามารถพิเศษ
   profileNewAbility: (type: string) => `${registryNew}${type}/ability`,
@@ -102,6 +112,8 @@ export default {
     `${registryNew}${type}/ability/${abilityId}`,
   profileNewAbilityHisByAbilityId: (abilityId: string, type: string) =>
     `${registryNew}${type}/ability/admin/history/${abilityId}`,
+  profileAbilityUpdateDelete: (type: string) =>
+    `${registryNew}${type}/ability/update-delete/`,
 
   // ใบอนุญาตประกอบวิชาชีพ
   profileNewCertificate: (type: string) => `${registryNew}${type}/certificate`,
@@ -113,6 +125,8 @@ export default {
     certificateId: string,
     type: string
   ) => `${registryNew}${type}/certificate/admin/history/${certificateId}`,
+  profileCertificateUpdateDelete: (type: string) =>
+    `${registryNew}${type}/certificate/update-delete/`,
 
   // ข้อมูลอื่นๆ
   profileNewOther: (type: string) => `${registryNew}${type}/other`,
@@ -122,6 +136,8 @@ export default {
     `${registryNew}${type}/other/${dataId}`,
   profileNewOtherHisById: (dataId: string, type: string) =>
     `${registryNew}${type}/other/admin/history/${dataId}`,
+  profileOtherUpdateDelete: (type: string) =>
+    `${registryNew}${type}/other/update-delete/`,
 
   // ข้อมูลครอบครัว
   profileNewFamily: (type: string) => `${registryNew}${type}/family`,
@@ -142,6 +158,8 @@ export default {
     `${registryNew}${type}/discipline/admin/history/${disciplineId}`,
   disciplineListCard: (profileId: string, type: string) =>
     `${registryNew}${type}/discipline/admin/${profileId}`, // noPermission
+  profileNewDisciplineUpdateDelete: (type: string) =>
+    `${registryNew}${type}/discipline/update-delete/`,
 
   // ปฏิบัติราชการพิเศษ
   profileNewDuty: (type: string) => `${registryNew}${type}/duty`,
@@ -151,6 +169,8 @@ export default {
     `${registryNew}${type}/duty/${dutyId}`,
   profileNewDutyHisByDutyId: (dutyId: string, type: string) =>
     `${registryNew}${type}/duty/admin/history/${dutyId}`,
+  profileDutyUpdateDelete: (type: string) =>
+    `${registryNew}${type}/duty/update-delete/`,
 
   //ข้อมูลราชการ
   profileNewGovernment: (type: string) => `${registryNew}${type}/government`,
@@ -171,6 +191,8 @@ export default {
   profileNewLeaveType: () => `${env.API_URI}/leave/type`,
   leaveListCard: (id: string, type: string) =>
     `${registryNew}${type}/leave/admin/${id}`, //noPermission
+  profileNewLeaveUpdateDelete: (type: string) =>
+    `${registryNew}${type}/leave/update-delete/`,
 
   /** ตำแหน่ง*/
   profileSalaryPositionNew: (type: string) =>
@@ -205,12 +227,16 @@ export default {
     `${registryNew}${type}/changeName/${changeNameId}`,
   profileNewChangeNameHisByChangeNameId: (changeNameId: string, type: string) =>
     `${registryNew}${type}/changeName/history/${changeNameId}`,
+  profileNewChangeNameUpdateDelete: (type: string) =>
+    `${registryNew}${type}/changeName/update-delete/`,
 
   //ข้อมูลครอบครับ
   profileFamily: (empType: string, type: string) =>
     `${registryNew}${empType}/family/${type}`,
   profileFamilyHistory: (id: string, empType: string, type: string) =>
     `${registryNew}${empType}/family/${type}/history/${id}`,
+  profileFamilyUpdateDelete: (empType: string, type: string) =>
+    `${registryNew}${empType}/family/${type}/update-delete/`,
 
   //ลูกจ้างชั่วคราว
   positionEmployee: (id: string) => `${registryNew}-employee/position/${id}`,
@@ -235,7 +261,8 @@ export default {
     `${registryNew}${type}/actposition/${id}`,
   profileActpositionHistory: (id: string, type: string) =>
     `${registryNew}${type}/actposition/history/${id}`,
-  profileActpositionUpdateDelete: `${registryNew}/actposition/update-delete/`,
+  profileActpositionUpdateDelete: (type: string) =>
+    `${registryNew}${type}/actposition/update-delete/`,
 
   //ช่วยราชการ
   profileAssistance: (type: string, id: string) =>
@@ -243,4 +270,6 @@ export default {
   profileAssistanceHistory: (id: string, type: string) =>
     `${registryNew}${type}/assistance/history/${id}`,
   profileAssistanceReturn: `${env.API_URI}/placement/repatriation`,
+  profileAssistanceUpdateDelete: (type: string) =>
+    `${registryNew}${type}/assistance/update-delete/`,
 };
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 2e204649a..e52e3851e 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -30,6 +30,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 const { createPathUploadFlie, getPathUploadFlie, uploadFile } =
   useRegistryNewDataStore();
@@ -361,18 +362,20 @@ function serchDataTable() {
 }
 
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  //   await fetchData(id.value);
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileCertificateUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData(id.value);
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /**
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 dcb513021..e8c2a2b69 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -405,7 +405,7 @@ function onDelete(rowId: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.patch(config.API.profileTrainingUpdate + `${rowId}`);
+      await http.patch(config.API.profileTrainingUpdate(empType.value) + `${rowId}`);
       await fetchData(id.value);
       await success($q, "ลบข้อมูลสำเร็จ");
     } catch (err) {
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 5425f40b0..5da6c11e0 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -37,6 +37,7 @@ const {
   dialogConfirm,
   pathRegistryEmp,
   onSearchDataTable,
+  dialogRemove,
 } = mixin;
 
 const isUpload = ref<boolean>(false);
@@ -333,8 +334,6 @@ async function getInsigniaActive() {
     .get(config.API.orgInsigniaActive())
     .then((res) => {
       const data = res.data.result;
-      console.log(data);
-
       mapInsigniaOption(data);
     })
     .catch((e) => {
@@ -647,18 +646,20 @@ function serchDataTable() {
 }
 
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  //    await fetchData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewInsignUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 d424c3fc1..df987e6c6 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -33,6 +33,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const profileId = ref<string>(
@@ -446,18 +447,20 @@ function serchDataTable() {
 }
 
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  // await   fetchData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewHonorUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 fb1bc8369..ec8e70cb6 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -526,7 +526,9 @@ function onDelete(rowId: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.patch(config.API.profileDevelopmentUpdateDelete + `${rowId}`);
+      await http.patch(
+        config.API.profileDevelopmentUpdateDelete(empType.value) + `${rowId}`
+      );
       empType.value !== "-temp" && (await getDevelop());
       await success($q, "ลบข้อมูลสำเร็จ");
     } catch (err) {
@@ -542,18 +544,20 @@ function onDelete(rowId: string) {
  * @param rowId ที่ต้องการลบข้อมูล
  */
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  // await   fetchData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewAssessmentsUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 onMounted(async () => {
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 d7d83e5bb..a726a067f 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -35,6 +35,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const profileId = ref<string>(
@@ -461,18 +462,20 @@ function serchDataTable() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //   await fetchData(profileId.value);
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewDisciplineUpdateDelete(empType.value) + `${id}`
+      );
+      await fetchData(profileId.value);
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 65800bf1f..726ed821a 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -39,6 +39,7 @@ const {
   dateToISO,
   pathRegistryEmp,
   onSearchDataTable,
+  dialogRemove,
 } = mixin;
 
 const profileId = ref<string>(
@@ -477,18 +478,20 @@ function clickEditRowType() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await getData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewLeaveUpdateDelete(empType.value) + `${id}`
+      );
+      await getData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 1f20d23f0..7e35b8f24 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -31,6 +31,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const profileId = ref<string>(
@@ -448,19 +449,21 @@ function serchDataTable() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //    await fetchData(profileId.value);
-  //
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileDutyUpdateDelete(empType.value) + `${id}`
+      );
+      await fetchData(profileId.value);
+
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งา*/
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
index 37f6fcbd5..b13649a6f 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
@@ -299,7 +299,9 @@ function onDelete(rowId: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.patch(config.API.profileActpositionUpdateDelete + `${rowId}`);
+      await http.patch(
+        config.API.profileActpositionUpdateDelete(empType.value) + `${rowId}`
+      );
       await fetchData();
       await success($q, "ลบข้อมูลสำเร็จ");
     } catch (err) {
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index 15f2a0f5d..c97cbb2c3 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -35,6 +35,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const profileId = ref<string>(
@@ -439,18 +440,20 @@ async function onReturner(refId: string) {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await fetchData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileAssistanceUpdateDelete(empType.value) + `${id}`
+      );
+      await fetchData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 onMounted(() => {
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 e27a81761..bc87c4227 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -26,6 +26,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const id = ref<string>("");
@@ -243,18 +244,20 @@ function serchDataTable() {
 }
 
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  // await   getData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileOtherUpdateDelete(empType.value) + `${rowId}`
+      );
+      await getData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 onMounted(() => {
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 69999ffe6..cbe7f361e 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -368,18 +368,20 @@ function searchDataTable() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await fetchData(profileId.value);
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewChangeNameUpdateDelete(empType.value) + `${id}`
+      );
+      await fetchData(profileId.value);
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ดูการเปลี่ยนแปลงของข้อมูลฟอร์ท เปลี่ยนชื่อ-นามสกุล*/
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 3eda0cf5b..4574f5e44 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -31,6 +31,7 @@ const {
   messageError,
   success,
   pathRegistryEmp,
+  dialogRemove,
 } = useCounterMixin();
 
 /** props*/
@@ -508,18 +509,21 @@ async function fetchDataHistory() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await fetchDataCouple();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileFamilyUpdateDelete(empType.value, "children") +
+          `${id}`
+      );
+      await fetchDataChildren();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 793b17e1c..8a731e545 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -36,6 +36,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = mixin;
 
 const id = ref<string>(route.params.id.toString()); //id profile
@@ -576,19 +577,21 @@ async function fetchDataHistory() {
   }
 }
 
-function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await fetchData(profileId.value);
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+function handleDelete(rowId: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileEducationUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData(id.value);
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ฟังก์ค้นหาข้อมูลรายการประวัติการศึกษา */
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 b9c7e5355..2de52e4cc 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -30,6 +30,7 @@ const {
   date2Thai,
   pathRegistryEmp,
   onSearchDataTable,
+  dialogRemove,
 } = mixin;
 
 const id = ref<string>(route.params.id.toString()); //id profile
@@ -404,18 +405,20 @@ function serchDataTable() {
 }
 
 function handleDelete(rowId: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${rowId}`);
-  //     await  fetchData(id.value);
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileAbilityUpdateDelete(empType.value) + `${rowId}`
+      );
+      await fetchData(id.value);
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
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 64756b5b1..5b9a69d3b 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -29,6 +29,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  dialogRemove,
 } = useCounterMixin();
 const { createPathUploadFlie, getPathUploadFlie, uploadFile } =
   useRegistryNewDataStore();
@@ -336,18 +337,20 @@ function serchDataTable() {
 }
 
 function handleDelete(id: string) {
-  // dialogRemove($q, async () => {
-  //   showLoader();
-  //   try {
-  //     await http.delete(config.API.profileChangeNameUpdate + `${id}`);
-  //     await getData();
-  //     success($q, "ลบข้อมูลสำเร็จ");
-  //   } catch (err) {
-  //     messageError($q, err);
-  //   } finally {
-  //     hideLoader();
-  //   }
-  // });
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileNewNoPaidUpdateDelete(empType.value) + `${id}`
+      );
+      await getData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน */