ทะเบียนประวัติ => ข้อมูลผลงาน,ข้อมูลอื่นๆ

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 : "-" }}

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 : "-" }}