From 4cf44a656eee30044cf1bae4c31948a7e2e1d474 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Fri, 29 Mar 2024 16:49:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=95=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Achievement/01_ProfessionalLicense.vue    | 74 +++++-------------
 .../detail/Achievement/02_Train.vue           | 40 ----------
 .../detail/Achievement/03_Insignia.vue        | 40 ----------
 .../Achievement/04_DeclarationHonor.vue       | 40 ----------
 .../Achievement/05_ResultsPerformance.vue     | 40 ----------
 .../GovernmentInformation/02_Discipline.vue   | 56 +++++---------
 .../02_DisciplineHistory.vue                  | 20 -----
 .../detail/GovernmentInformation/03_Leave.vue | 51 +++++--------
 .../GovernmentInformation/03_LeaveHistory.vue | 20 -----
 .../04_PerformSpecialWork.vue                 | 56 +++++---------
 .../04_PerformSpecialWorkHistory.vue          | 20 -----
 .../detail/Other/01_OtherInformation.vue      | 20 -----
 .../Other/01_OtherInformationHistory.vue      | 20 -----
 .../detail/PersonalInformation/01_Profile.vue | 20 -----
 .../02_NameChangeHistory.vue                  | 76 +++++--------------
 .../detail/PersonalInformation/03_Address.vue | 20 -----
 .../PersonalInformation/05_Education.vue      | 76 +++++--------------
 .../PersonalInformation/06_SpecialSkill.vue   | 40 ----------
 .../detail/Salary/01_PositionSalary.vue       | 20 -----
 .../Salary/01_PositionSalaryHistory.vue       | 20 -----
 .../detail/Salary/02_NotReceiveSalary.vue     | 20 -----
 .../Salary/02_NotReceiveSalaryHistory.vue     | 20 -----
 22 files changed, 110 insertions(+), 699 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index cb75991a6..2195d1b9d 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -297,21 +297,21 @@ async function editData(idData: string) {
     });
 }
 
-function deleteData(idData: string) {
-  dialogRemove($q, () =>
-    http
-      .delete(config.API.profileNewCertificateByCertificateId(idData))
-      .then(() => {
-        fetchData(id.value);
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      })
-  );
-}
+// function deleteData(idData: string) {
+//   dialogRemove($q, () =>
+//     http
+//       .delete(config.API.profileNewCertificateByCertificateId(idData))
+//       .then(() => {
+//         fetchData(id.value);
+//       })
+//       .catch((err) => {
+//         messageError($q, err);
+//       })
+//       .finally(() => {
+//         hideLoader();
+//       })
+//   );
+// }
 
 async function fetchHistoryData(id: string) {
   showLoader();
@@ -465,7 +465,7 @@ onMounted(async () => {
           >
             <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -477,7 +477,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
@@ -529,26 +529,6 @@ onMounted(async () => {
         </q-card>
       </div>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
@@ -774,26 +754,6 @@ onMounted(async () => {
               </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index fe13d0da0..d2aaba5f0 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -690,26 +690,6 @@ onMounted(async () => {
         </q-card>
       </div>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
@@ -1164,26 +1144,6 @@ onMounted(async () => {
               </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index f023c6b4d..45224dd9e 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -789,26 +789,6 @@ onMounted(async () => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modal" persistent>
@@ -1218,26 +1198,6 @@ onMounted(async () => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index 0a7fd4450..8d6addcb4 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -531,26 +531,6 @@ watch(
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modal" persistent>
@@ -849,26 +829,6 @@ watch(
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
index b8ef11535..0a4be22ad 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -583,26 +583,6 @@ onMounted(async () => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modal" persistent>
@@ -895,26 +875,6 @@ onMounted(async () => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index fc7b7a7db..03ad52ace 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -276,22 +276,22 @@ async function editData(idData: string) {
     });
 }
 
-function deleteData(idData: string) {
-  dialogRemove($q, () =>
-    http
-      .delete(config.API.profileNewDisciplineByDisciplineId(idData))
-      .then(() => {
-        fetchData(profileId.value);
-        success($q, "ลบข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      })
-  );
-}
+// function deleteData(idData: string) {
+//   dialogRemove($q, () =>
+//     http
+//       .delete(config.API.profileNewDisciplineByDisciplineId(idData))
+//       .then(() => {
+//         fetchData(profileId.value);
+//         success($q, "ลบข้อมูลสำเร็จ");
+//       })
+//       .catch((err) => {
+//         messageError($q, err);
+//       })
+//       .finally(() => {
+//         hideLoader();
+//       })
+//   );
+// }
 /**
  * กดเลือกข้อมูลที่จะแก้ไข
  * @param props ค่า props ใน row ที่เลือก
@@ -467,7 +467,7 @@ onMounted(async () => {
           >
             <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -479,7 +479,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
@@ -573,26 +573,6 @@ onMounted(async () => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <!-- dialog add edit -->
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
index c836f9888..5ba868aa4 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@@ -280,26 +280,6 @@ watch(modal, (status) => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
index 5fccf2728..f372923bd 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -55,7 +55,6 @@ const formFilter = reactive<FormFilter>({
   isProbation: false,
 });
 
-
 const modal = ref<boolean>(false);
 const edit = ref<boolean>(false);
 const modalHistory = ref<boolean>(false);
@@ -252,7 +251,11 @@ function openDialogEdit(props: DetailData) {
   edit.value = true;
   modal.value = true;
   id.value = props.id;
-  typeLeave.value = {id:props.typeLeaveId,name:props.typeLeave,code:props.code};
+  typeLeave.value = {
+    id: props.typeLeaveId,
+    name: props.typeLeave,
+    code: props.code,
+  };
   statLeave.value = props.status;
   reason.value = props.reason;
   dateRange.value = [
@@ -392,7 +395,7 @@ const editData = async () => {
   http
     .patch(config.API.profileNewLeaveById(id.value), {
       leaveTypeId: typeLeave.value.id,
-      dateLeaveStart : dateToISO(dateRange.value[0]),
+      dateLeaveStart: dateToISO(dateRange.value[0]),
       dateLeaveEnd: dateToISO(dateRange.value[1]),
       leaveDays: numLeave.value,
       leaveCount: 0,
@@ -545,11 +548,7 @@ onMounted(() => {
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td
-          v-for="col in props.cols"
-          :key="col.id"
-          @click="openDialogEdit(props.row)"
-        >
+        <q-td v-for="col in props.cols" :key="col.id">
           <div v-if="col.name === 'no'">
             {{
               (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
@@ -568,6 +567,19 @@ onMounted(() => {
           </div>
         </q-td>
         <q-td auto-width>
+          <q-btn
+            color="primary"
+            flat
+            dense
+            round
+            class="q-mr-xs"
+            size="14px"
+            icon="mdi-pencil-outline"
+            clickable
+            @click="openDialogEdit(props.row)"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
           <q-btn
             color="info"
             flat
@@ -594,7 +606,7 @@ onMounted(() => {
                 flat
                 round
                 @click="openDialogEdit(props.row)"
-                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+                ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
               >
               <q-btn
                 color="info"
@@ -659,26 +671,6 @@ onMounted(() => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <!-- dialog add edit -->
@@ -760,7 +752,6 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                
                 ref="numLeaveRef"
                 class="full-width inputgreen cursor-pointer"
                 outlined
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
index c10b88c92..6d0df53d4 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue
@@ -322,26 +322,6 @@ watch(modal, (status) => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index d298b9830..c97b21415 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -247,22 +247,22 @@ async function editData(idData: string) {
 
 /** ลบข้อมูล */
 
-function deleteData(idData: string) {
-  dialogRemove($q, () =>
-    http
-      .delete(config.API.profileNewDutyByDutyId(idData))
-      .then(() => {
-        fetchData(profileId.value);
-        success($q, "ลบข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      })
-  );
-}
+// function deleteData(idData: string) {
+//   dialogRemove($q, () =>
+//     http
+//       .delete(config.API.profileNewDutyByDutyId(idData))
+//       .then(() => {
+//         fetchData(profileId.value);
+//         success($q, "ลบข้อมูลสำเร็จ");
+//       })
+//       .catch((err) => {
+//         messageError($q, err);
+//       })
+//       .finally(() => {
+//         hideLoader();
+//       })
+//   );
+// }
 
 /** กด Submit */
 
@@ -421,7 +421,7 @@ onMounted(async () => {
           >
             <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -433,7 +433,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
@@ -521,26 +521,6 @@ onMounted(async () => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modal" persistent>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
index ef9264f16..53cd2d0df 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@@ -281,26 +281,6 @@ watch(modal, (status) => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
index f638aa4f3..e7bc8b1b3 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
@@ -395,26 +395,6 @@ onMounted(() => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <!-- dialog add edit -->
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
index f46362eab..1d620f529 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue
@@ -218,26 +218,6 @@ watch(modal, (status) => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
index 5189c7711..affc3f90e 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue
@@ -839,26 +839,6 @@ onMounted(async () => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 35d63eae9..16b89582d 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -372,22 +372,22 @@ function editData(idData: string) {
     });
 }
 
-function deleteData(idData: string) {
-  dialogRemove($q, () =>
-    http
-      .delete(config.API.profileNewChangeNameByChangeNameId(idData))
-      .then(() => {
-        fetchData(profileId.value);
-        success($q, "ลบข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      })
-  );
-}
+// function deleteData(idData: string) {
+//   dialogRemove($q, () =>
+//     http
+//       .delete(config.API.profileNewChangeNameByChangeNameId(idData))
+//       .then(() => {
+//         fetchData(profileId.value);
+//         success($q, "ลบข้อมูลสำเร็จ");
+//       })
+//       .catch((err) => {
+//         messageError($q, err);
+//       })
+//       .finally(() => {
+//         hideLoader();
+//       })
+//   );
+// }
 
 function deleteFileData(idData: string) {
   http
@@ -612,7 +612,7 @@ function filterSelector(val: string, update: Function, refData: string) {
           >
             <q-tooltip>ดูประวัติการเปลี่ยนชื่อ-นามสกุล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -624,30 +624,10 @@ function filterSelector(val: string, update: Function, refData: string) {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
@@ -934,26 +914,6 @@ function filterSelector(val: string, update: Function, refData: string) {
               <q-td auto-width> </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
index b7a6fa44d..c87668fc8 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue
@@ -903,26 +903,6 @@ onMounted(async () => {
               direction-links
             ></q-pagination>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 829696289..581588854 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -661,22 +661,22 @@ function editData(idData: string) {
     });
 }
 
-function deleteData(idData: string) {
-  dialogRemove($q, () =>
-    http
-      .delete(config.API.profileNewEducationByEducationId(idData))
-      .then(() => {
-        fetchData(id.value);
-        success($q, "ลบข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      })
-  );
-}
+// function deleteData(idData: string) {
+//   dialogRemove($q, () =>
+//     http
+//       .delete(config.API.profileNewEducationByEducationId(idData))
+//       .then(() => {
+//         fetchData(id.value);
+//         success($q, "ลบข้อมูลสำเร็จ");
+//       })
+//       .catch((err) => {
+//         messageError($q, err);
+//       })
+//       .finally(() => {
+//         hideLoader();
+//       })
+//   );
+// }
 
 onMounted(async () => {
   await fetchData(id.value);
@@ -819,7 +819,7 @@ onMounted(async () => {
           >
             <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -831,7 +831,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
@@ -945,26 +945,6 @@ onMounted(async () => {
         </q-card>
       </div>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
@@ -1468,26 +1448,6 @@ onMounted(async () => {
               <q-td auto-width> </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
index 0905a188a..5d5de6633 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -501,26 +501,6 @@ onMounted(async () => {
         </q-card>
       </div>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
@@ -664,26 +644,6 @@ onMounted(async () => {
               <q-td auto-width> </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
index 891148418..faa42288d 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -533,26 +533,6 @@ onMounted(() => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modalDialogSalary" persistent full-width>
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
index ead04e503..06c4f0719 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue
@@ -321,26 +321,6 @@ watch(
               </q-td>
             </q-tr>
           </template>
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
index 7fbf4750d..53b85fcc5 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -426,26 +426,6 @@ onMounted(() => {
         direction-links
       ></q-pagination>
     </template>
-    <template v-slot:no-data="{ icon, message, filter }">
-      <div class="full-width row flex-center text-accent q-gutter-sm">
-        <span
-          ><div
-            style="
-              height: 50vh;
-              display: flex;
-              flex-direction: column;
-              justify-content: center;
-              align-items: center;
-            "
-            class="text-grey-5"
-          >
-            <q-icon name="search" size="4rem" />
-
-            <span>ไม่พบข้อมูล</span>
-          </div>
-        </span>
-      </div>
-    </template>
   </d-table>
 
   <q-dialog v-model="modalDialog" persistent>
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
index 56ce243c7..51d24ab5e 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@@ -222,26 +222,6 @@ watch(modal, (status) => {
             direction-links
           ></q-pagination>
         </template> -->
-          <template v-slot:no-data="{ icon, message, filter }">
-            <div class="full-width row flex-center text-accent q-gutter-sm">
-              <span
-                ><div
-                  style="
-                    height: 50vh;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-                    align-items: center;
-                  "
-                  class="text-grey-5"
-                >
-                  <q-icon name="search" size="4rem" />
-
-                  <span>ไม่พบข้อมูล</span>
-                </div>
-              </span>
-            </div>
-          </template>
         </d-table>
       </q-card-section>
     </q-card>