From b6dde4cfc55397245e0a0443ff8eaae40208b551 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 6 Aug 2024 10:27:54 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=20=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20btn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organization/components/TreeMain.vue   | 98 ++++++++++---------
 .../02_organization/components/TreeTable.vue  | 26 +++--
 2 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/src/modules/02_organization/components/TreeMain.vue b/src/modules/02_organization/components/TreeMain.vue
index 37bf77c1c..402befd7d 100644
--- a/src/modules/02_organization/components/TreeMain.vue
+++ b/src/modules/02_organization/components/TreeMain.vue
@@ -448,11 +448,11 @@ watch(
                 v-if="store.typeOrganizational === 'draft'"
                 flat
                 dense
-                icon="mdi-dots-vertical"
-                class="q-ml-xs"
-                color="grey-13"
-                size="12px"
+                color="secondary"
+                icon="mdi-dots-horizontal-circle-outline"
                 round
+                dene
+                class="q-ml-xs"
               >
                 <q-menu>
                   <q-list
@@ -493,44 +493,53 @@ watch(
                       "
                     >
                       <q-item-section avatar style="min-width: 20px">
-                        <q-icon
-                          size="17px"
-                          :color="item.color"
-                          :name="item.icon"
-                        />
-                      </q-item-section>
-                      <div v-if="prop.node.orgLevel === 0">
-                        <q-item-section
-                          v-if="
-                            item.type === 'EDIT' ||
-                            item.type === 'DEL' ||
-                            item.type === 'HISTORY' ||
-                            item.type === 'SORT'
-                          "
-                        >
-                          {{ item.label }}หน่วยงาน
-                        </q-item-section>
-                        <q-item-section v-else-if="item.type === 'ADD'">
-                          {{ item.label }}ส่วนราชการ
-                        </q-item-section>
-                        <q-item-section v-else>
-                          {{ item.label }}
-                        </q-item-section>
-                      </div>
+                        <div class="row items-center">
+                          <q-icon
+                            size="xs"
+                            :color="item.color"
+                            :name="item.icon"
+                          />
+                          <div v-if="prop.node.orgLevel === 0">
+                            <div
+                              class="q-pl-md"
+                              v-if="
+                                item.type === 'EDIT' ||
+                                item.type === 'DEL' ||
+                                item.type === 'HISTORY' ||
+                                item.type === 'SORT'
+                              "
+                            >
+                              {{ item.label }}หน่วยงาน
+                            </div>
 
-                      <div v-else>
-                        <q-item-section
-                          v-if="
-                            item.type === 'ADD' ||
-                            item.type === 'EDIT' ||
-                            item.type === 'DEL' ||
-                            item.type === 'HISTORY' ||
-                            item.type === 'SORT'
-                          "
-                          >{{ item.label }}ส่วนราชการ</q-item-section
-                        >
-                        <q-item-section v-else>{{ item.label }}</q-item-section>
-                      </div>
+                            <div
+                              v-else-if="item.type === 'ADD'"
+                              class="q-pl-md"
+                            >
+                              {{ item.label }}ส่วนราชการ
+                            </div>
+                            <div v-else class="q-pl-md">
+                              {{ item.label }}
+                            </div>
+                          </div>
+
+                          <div v-else>
+                            <div
+                              class="q-pl-md"
+                              v-if="
+                                item.type === 'ADD' ||
+                                item.type === 'EDIT' ||
+                                item.type === 'DEL' ||
+                                item.type === 'HISTORY' ||
+                                item.type === 'SORT'
+                              "
+                            >
+                              {{ item.label }}ส่วนราชการ
+                            </div>
+                            <div v-else class="q-pl-md">{{ item.label }}</div>
+                          </div>
+                        </div>
+                      </q-item-section>
                     </q-item>
                   </q-list>
                 </q-menu>
@@ -540,11 +549,10 @@ watch(
                 v-else
                 flat
                 dense
-                icon="mdi-dots-vertical"
-                class="q-pa-none q-ml-xs"
-                color="grey-13"
-                size="12px"
+                color="secondary"
+                icon="mdi-dots-horizontal-circle-outline"
                 round
+                class="q-pa-none q-ml-xs"
               >
                 <q-menu>
                   <q-list
diff --git a/src/modules/02_organization/components/TreeTable.vue b/src/modules/02_organization/components/TreeTable.vue
index b7bec8fe6..c8fabea3c 100644
--- a/src/modules/02_organization/components/TreeTable.vue
+++ b/src/modules/02_organization/components/TreeTable.vue
@@ -574,12 +574,12 @@ watch(
         <q-tr :props="props" class="cursor-pointer">
           <q-td>
             <q-btn
+              v-if="store.typeOrganizational === 'draft'"
               flat
-              dense
-              icon="mdi-dots-vertical"
+              color="secondary"
+              icon="mdi-dots-horizontal-circle-outline"
+              round
               class="q-pa-none q-ml-xs"
-              color="grey-13"
-              size="12px"
             >
               <q-menu>
                 <q-list dense style="min-width: 150px">
@@ -625,9 +625,7 @@ watch(
                     </q-item-section>
                   </q-item>
                   <q-item
-                    v-for="(item, index) in store.typeOrganizational === 'draft'
-                      ? listMenu
-                      : listMenu.filter((e) => e.type === 'HISTORY')"
+                    v-for="(item, index) in listMenu"
                     :key="index"
                     clickable
                     v-close-popup
@@ -651,7 +649,7 @@ watch(
                       <div class="row items-center">
                         <q-icon
                           :color="item.color"
-                          size="17px"
+                          size="xs"
                           :name="item.icon"
                         />
                         <div class="q-pl-md">{{ item.label }}</div>
@@ -674,6 +672,18 @@ watch(
                 </q-list>
               </q-menu>
             </q-btn>
+
+            <q-btn
+              v-else
+              flat
+              dense
+              color="deep-purple"
+              icon="mdi-history"
+              round
+              @click.stop.pervent="onClickHistoryPos(props.row.id)"
+            >
+              <q-tooltip>ประวัติตำแหน่ง</q-tooltip>
+            </q-btn>
           </q-td>
           <q-td>
             <q-btn