From 2c3165df700a97a4c2451f22063e0014bd78e9aa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 5 Aug 2024 14:36:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A7=20=3D>=20permission?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../08_registryEmployee/views/Main.vue        | 108 +++++++-----------
 1 file changed, 44 insertions(+), 64 deletions(-)

diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index f19ed42f2..8bc6d2d2c 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -375,7 +375,13 @@ onMounted(() => {
       >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th auto-width />
+            <q-th
+              auto-width
+              v-if="
+                checkPermission($route)?.attrIsDelete ||
+                checkPermission($route)?.attrIsUpdate
+              "
+            />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -391,74 +397,48 @@ onMounted(() => {
               "
             >
               <q-btn
-                icon="mdi-dots-vertical"
-                size="12px"
-                color="grey-7"
+                v-if="
+                  (props.row.draftOrgEmployeeStatus === null ||
+                    props.row.draftOrgEmployeeStatus === 'WAITTING' ||
+                    props.row.draftOrgEmployeeStatus === 'PENDING') &&
+                  checkPermission($route)?.attrIsUpdate &&
+                  checkPermission($route)?.attrIsGet
+                "
                 flat
                 round
                 dense
+                color="blue"
+                icon="mdi-account-settings"
+                @click.pervent="onClickSelectPos(props.row)"
               >
-                <q-menu transition-show="jump-down" transition-hide="jump-up">
-                  <q-list dense style="min-width: 160px">
-                    <q-item
-                      clickable
-                      v-close-popup
-                      v-if="
-                        (props.row.draftOrgEmployeeStatus === null ||
-                          props.row.draftOrgEmployeeStatus === 'WAITTING' ||
-                          props.row.draftOrgEmployeeStatus === 'PENDING') &&
-                        checkPermission($route)?.attrIsUpdate
-                      "
-                      @click.pervent="onClickSelectPos(props.row)"
-                    >
-                      <q-item-section
-                        style="min-width: 0px"
-                        avatar
-                        class="q-py-sm"
-                      >
-                        <q-icon
-                          color="blue"
-                          size="xs"
-                          name="mdi-account-settings"
-                        />
-                      </q-item-section>
-                      <q-item-section>กำหนดตำแหน่ง</q-item-section>
-                    </q-item>
-                    <q-item
-                      v-if="checkPermission($route)?.attrIsUpdate"
-                      clickable
-                      v-close-popup
-                      @click.pervent="redirectToPageDetail(props.row.id)"
-                    >
-                      <q-item-section
-                        style="min-width: 0px"
-                        avatar
-                        class="q-py-sm"
-                      >
-                        <q-icon color="primary" size="xs" name="mdi-account" />
-                      </q-item-section>
-                      <q-item-section>แก้ไขข้อมูล</q-item-section>
-                    </q-item>
-                    <q-separator />
-                    <q-item
-                      v-if="checkPermission($route)?.attrIsDelete"
-                      clickable
-                      v-close-popup
-                      @click.pervent="onClickDelete(props.row.id)"
-                    >
-                      <q-item-section
-                        style="min-width: 0px"
-                        avatar
-                        class="q-py-sm"
-                      >
-                        <q-icon color="red" size="xs" name="mdi-delete" />
-                      </q-item-section>
-                      <q-item-section>ลบ</q-item-section>
-                    </q-item>
+                <q-tooltip>กำหนดตำแหน่ง </q-tooltip>
+              </q-btn>
 
-                    <q-separator />
-                  </q-list>
-                </q-menu>
+              <q-btn
+                v-if="
+                  checkPermission($route)?.attrIsUpdate &&
+                  checkPermission($route)?.attrIsGet
+                "
+                flat
+                round
+                dense
+                color="edit"
+                icon="edit"
+                @click.pervent="redirectToPageDetail(props.row.id)"
+              >
+                <q-tooltip>แก้ไขข้อมูล </q-tooltip>
+              </q-btn>
+
+              <q-btn
+                v-if="checkPermission($route)?.attrIsDelete"
+                flat
+                round
+                dense
+                color="red"
+                icon="mdi-delete"
+                @click.pervent="onClickDelete(props.row.id)"
+              >
+                <q-tooltip>ลบ </q-tooltip>
               </q-btn>
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">