From 82463dbb00abe04439d8a7521b0430421457e6e7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 5 Aug 2024 14:22:14 +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=3D>=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=9C=E0=B8=A5=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99,=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=AD=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B9=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Achievement/01_ProfessionalLicense.vue    | 75 +++++++------------
 .../detail/Achievement/02_Train.vue           | 64 +++++++---------
 .../detail/Achievement/03_Insignia.vue        | 61 +++++++--------
 .../Achievement/04_DeclarationHonor.vue       | 58 +++++++-------
 .../Achievement/05_ResultsPerformance.vue     | 58 +++++++-------
 .../detail/Employee/01_DataEmployee.vue       |  8 +-
 .../detail/Employee/02_Employment.vue         | 37 +++++----
 .../detail/Other/01_OtherInformation.vue      | 49 ++++++------
 .../Other/01_OtherInformationHistory.vue      |  2 +-
 9 files changed, 180 insertions(+), 232 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 2415d54ec..de3d93189 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, watch, onMounted } from "vue";
+import { ref, reactive, onMounted } from "vue";
 import { checkPermission } from "@/utils/permissions";
 import dialogHeader from "@/components/DialogHeader.vue";
 import type { QTableProps } from "quasar";
@@ -442,17 +442,27 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props">
         <q-td auto-width>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
-            color="primary"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            icon="mdi-pencil-outline"
+            color="deep-purple"
+            icon="mdi-history"
+            @click="
+              () => (fetchHistoryData(props.row.id), (historyDialog = true))
+            "
+          >
+            <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
             clickable
             @click="
               () => {
@@ -462,32 +472,6 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
-            color="info"
-            flat
-            dense
-            round
-            size="14px"
-            icon="mdi-history"
-            @click="
-              () => (fetchHistoryData(props.row.id), (historyDialog = true))
-            "
-          >
-            <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
-          </q-btn>
-          <!-- <q-btn
-            color="red"
-            flat
-            dense
-            round
-            size="14px"
-            icon="mdi-delete"
-            clickable
-            @click.stop="deleteData(props.row.id)"
-            v-close-popup
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn> -->
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
@@ -503,27 +487,26 @@ onMounted(async () => {
         <q-card bordered>
           <q-card-actions align="right" class="bg-grey-3">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
               flat
               round
-              color="primary"
-              icon="edit"
-              @click="editForm(props.row)"
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              round
-              color="info"
+              color="deep-purple"
               icon="mdi-history"
-              size="14px"
               @click="
                 () => (fetchHistoryData(props.row.id), (historyDialog = true))
               "
             >
               <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              round
+              color="edit"
+              icon="edit"
+              @click="editForm(props.row)"
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
@@ -764,7 +747,7 @@ onMounted(async () => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
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 448a1b2e6..5439f87d3 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@@ -600,18 +600,27 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props">
         <q-td auto-width>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
-            color="primary"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            icon="mdi-pencil-outline"
-            clickable
+            color="deep-purple"
+            icon="mdi-history"
+            @click="
+              () => (fetchHistoryData(props.row.id), (historyDialog = true))
+            "
+          >
+            <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
             @click="
               () => {
                 editForm(props.row);
@@ -620,19 +629,6 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
-            color="info"
-            flat
-            dense
-            round
-            size="14px"
-            icon="mdi-history"
-            @click="
-              () => (fetchHistoryData(props.row.id), (historyDialog = true))
-            "
-          >
-            <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
-          </q-btn>
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
@@ -648,28 +644,26 @@ onMounted(async () => {
         <q-card bordered>
           <q-card-actions align="right" class="bg-grey-3">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
               flat
               round
-              size="14px"
-              color="primary"
-              icon="mdi-pencil-outline"
-              @click="editForm(props.row)"
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              round
-              size="14px"
-              color="info"
-              icon="history"
+              color="deep-purple"
+              icon="mdi-history"
               @click="
                 () => (fetchHistoryData(props.row.id), (historyDialog = true))
               "
             >
               <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              round
+              color="edit"
+              icon="edit"
+              @click="editForm(props.row)"
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <q-list>
@@ -1139,7 +1133,7 @@ onMounted(async () => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
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 f3546bcfa..da6baa35b 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -715,39 +715,32 @@ onMounted(async () => {
     </template>
 
     <template v-slot:body="props" v-if="modeView === 'table'">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props">
         <q-td auto-width>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            color="primary"
-            icon="mdi-pencil-outline"
-            @click="onClickOpenDialog(true, props.row)"
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            flat
-            dense
-            round
-            size="14px"
-            color="info"
+            color="deep-purple"
             icon="mdi-history"
             @click="clickHistory(props.row)"
           >
             <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
           </q-btn>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
+            @click="onClickOpenDialog(true, props.row)"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
-        <q-td
-          v-for="col in props.cols"
-          class="cursor-pointer"
-          :key="col.name"
-          :props="props"
-        >
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
           <div class="table_ellipsis">
             {{ col.value ? col.value : "-" }}
           </div>
@@ -760,24 +753,24 @@ onMounted(async () => {
         <q-card bordered>
           <q-card-actions class="bg-grey-3" align="right">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
               flat
               round
-              color="primary"
-              icon="mdi-pencil-outline"
-              @click="onClickOpenDialog(true, props.row)"
-            >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              round
-              color="info"
+              color="deep-purple"
               icon="mdi-history"
               @click="clickHistory(props.row)"
             >
               <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              round
+              color="edit"
+              icon="edit"
+              @click="onClickOpenDialog(true, props.row)"
+            >
+              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <div>
@@ -1189,7 +1182,7 @@ onMounted(async () => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
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 551a80e72..e3f32e15b 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@@ -448,36 +448,28 @@ onMounted(async () => {
       <q-tr :props="props">
         <q-td auto-width>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            color="primary"
-            icon="mdi-pencil-outline"
-            @click="onClickOpenDialog(true, props.row)"
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="info"
-            flat
-            dense
-            round
-            size="14px"
+            color="deep-purple"
             icon="mdi-history"
             @click="clickHistory(props.row)"
           >
             <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
+            @click="onClickOpenDialog(true, props.row)"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
-        <q-td
-          v-for="col in props.cols"
-          :key="col.name"
-          :props="props"
-          class="cursor-pointer"
-        >
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
           <div class="table_ellipsis">
             {{ col.value ? col.value : "-" }}
           </div>
@@ -490,24 +482,24 @@ onMounted(async () => {
         <q-card bordered>
           <q-card-actions class="bg-grey-3" align="right">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
               flat
               round
-              color="primary"
-              icon="mdi-pencil-outline"
-              @click="onClickOpenDialog(true, props.row)"
-            >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              round
-              color="info"
+              color="deep-purple"
               icon="mdi-history"
               @click.stop.prevent="clickHistory(props.row)"
             >
               <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              round
+              color="edit"
+              icon="edit"
+              @click="onClickOpenDialog(true, props.row)"
+            >
+              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <div>
@@ -822,7 +814,7 @@ onMounted(async () => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
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 4ab2675e0..f40030d5b 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -520,36 +520,28 @@ onMounted(async () => {
       <q-tr :props="props">
         <q-td auto-width>
           <q-btn
-            v-if="checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            color="primary"
-            icon="mdi-pencil-outline"
-            @click="onClickOpenDialog(true, props.row)"
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
-            color="info"
-            flat
-            dense
-            round
-            size="14px"
+            color="deep-purple"
             icon="mdi-history"
             @click="clickHistory(props.row)"
           >
             <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
+            @click="onClickOpenDialog(true, props.row)"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
         </q-td>
-        <q-td
-          v-for="col in props.cols"
-          :key="col.name"
-          :props="props"
-          class="cursor-pointer"
-        >
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
           <div class="table_ellipsis">
             {{ col.value ? col.value : "-" }}
           </div>
@@ -562,24 +554,24 @@ onMounted(async () => {
         <q-card bordered>
           <q-card-actions class="bg-grey-3" align="right">
             <q-btn
-              v-if="checkPermission($route)?.attrIsUpdate"
               flat
               round
-              color="primary"
-              icon="mdi-pencil-outline"
-              @click.stop.prevent="onClickOpenDialog(true, props.row)"
-            >
-              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              round
-              color="info"
+              color="deep-purple"
               icon="mdi-history"
               @click="clickHistory(props.row)"
             >
               <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
             </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              round
+              color="edit"
+              icon="edit"
+              @click.stop.prevent="onClickOpenDialog(true, props.row)"
+            >
+              <q-tooltip>แก่ไขข้อมุล</q-tooltip>
+            </q-btn>
           </q-card-actions>
           <q-separator />
           <div>
@@ -834,7 +826,7 @@ onMounted(async () => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index 7c7955779..a6baf3f4c 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -303,8 +303,8 @@ onMounted(() => {
         flat
         round
         dense
-        icon="mdi-pencil-outline"
-        color="primary"
+        icon="edit"
+        color="edit"
         @click="onClickEdit"
       >
         <q-tooltip>แก้ไขข้อมูล</q-tooltip>
@@ -314,7 +314,7 @@ onMounted(() => {
         round
         dense
         icon="mdi-history"
-        color="info"
+        color="deep-purple"
         @click="onClickHistory"
       >
         <q-tooltip>ประวัติแก้ไขข้อมูลลูกจ้างชั่วคราว</q-tooltip>
@@ -614,7 +614,7 @@ onMounted(() => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}
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 c26885415..3dfbd0357 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@@ -290,8 +290,6 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
-          <q-th auto-width v-if="checkPermission($route)?.attrIsUpdate" />
-          <q-th auto-width v-if="checkPermission($route)?.attrIsDelete" />
           <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>
@@ -299,21 +297,31 @@ onMounted(() => {
         </q-tr>
       </template>
       <template v-slot:body="props">
-        <q-tr :props="props" class="cursor-pointer" style="height: 40px">
-          <q-td v-if="checkPermission($route)?.attrIsUpdate">
+        <q-tr :props="props">
+          <q-td auto-width>
             <q-btn
               dense
               flat
               round
-              color="primary"
-              icon="mdi-pencil"
+              color="deep-purple"
+              icon="mdi-history"
+              @click="onClickHistory(props.row.id)"
+            >
+              <q-tooltip>ประวัติข้อมูลการจ้าง </q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              dense
+              flat
+              round
+              color="edit"
+              icon="edit"
               @click="onOpenDialog(true, props.row.id)"
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
-          </q-td>
-          <q-td v-if="checkPermission($route)?.attrIsDelete">
             <q-btn
+              v-if="checkPermission($route)?.attrIsDelete"
               dense
               flat
               round
@@ -324,18 +332,7 @@ onMounted(() => {
               <q-tooltip>ลบข้อมูล</q-tooltip></q-btn
             >
           </q-td>
-          <q-td>
-            <q-btn
-              dense
-              flat
-              round
-              color="info"
-              icon="mdi-history"
-              @click="onClickHistory(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>
               {{ col.value ? col.value : "-" }}
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 b8a52959e..d7d3ed4d1 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -321,32 +321,29 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props">
         <q-td auto-width>
+          <q-btn
+            flat
+            dense
+            round
+            color="deep-purple"
+            icon="mdi-history"
+            @click="openDialogHistory(props.row.id)"
+          >
+            <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
+          </q-btn>
           <q-btn
             v-if="checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round
-            class="q-mr-xs"
-            size="14px"
-            color="primary"
-            icon="mdi-pencil-outline"
+            color="edit"
+            icon="edit"
             @click="openDialogEdit(props.row)"
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
-            color="info"
-            flat
-            dense
-            round
-            size="14px"
-            icon="mdi-history"
-            @click="openDialogHistory(props.row.id)"
-          >
-            <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
-          </q-btn>
         </q-td>
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
@@ -362,22 +359,22 @@ onMounted(() => {
             <q-space />
             <div class="q-gutter-x-sm">
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
-                color="primary"
-                icon="mdi-pencil-outline"
-                flat
-                round
-                @click="openDialogEdit(props.row)"
-                ><q-tooltip>แก้ไข</q-tooltip></q-btn
-              >
-              <q-btn
-                color="info"
+                color="deep-purple"
                 icon="mdi-history"
                 flat
                 round
                 @click="openDialogHistory(props.row.id)"
                 ><q-tooltip>ประวิติแก้ไขอื่นๆ</q-tooltip></q-btn
               >
+              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
+                color="edit"
+                icon="edit"
+                flat
+                round
+                @click="openDialogEdit(props.row)"
+                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+              >
             </div>
           </div>
           <q-separator />
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
index cf5affeff..bb22ad1b0 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
@@ -202,7 +202,7 @@ watch(modal, (status) => {
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
+            <q-tr :props="props">
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>
                   {{ col.value ? col.value : "-" }}