From b4e12f1d89412d3f8eeb05daf4a31d31ff3295f0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 8 Aug 2024 16:56:25 +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,=20=E0=B8=A2=E0=B8=B8=E0=B8=97=E0=B8=98=E0=B8=A8=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=95=E0=B8=A3=E0=B9=8C=20=3D>=20icon=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_masterdata/views/Strategic.vue |   4 +-
 .../02_organization/components/TreeMain.vue   | 296 +++++++++---------
 2 files changed, 144 insertions(+), 156 deletions(-)

diff --git a/src/modules/01_masterdata/views/Strategic.vue b/src/modules/01_masterdata/views/Strategic.vue
index e023d3c8e..722c4a28b 100644
--- a/src/modules/01_masterdata/views/Strategic.vue
+++ b/src/modules/01_masterdata/views/Strategic.vue
@@ -258,8 +258,8 @@ onMounted(() => {
               "
               flat
               dense
-              color="secondary"
-              icon="mdi-dots-horizontal-circle-outline"
+              color="grey-13"
+              icon="mdi-dots-vertical"
               round
             >
               <q-menu>
diff --git a/src/modules/02_organization/components/TreeMain.vue b/src/modules/02_organization/components/TreeMain.vue
index e74fdf436..1358a11fa 100644
--- a/src/modules/02_organization/components/TreeMain.vue
+++ b/src/modules/02_organization/components/TreeMain.vue
@@ -428,160 +428,11 @@ watch(
               :active="nodeId == prop.node.orgTreeId"
               @click.stop="updateSelected(prop.node)"
               active-class="my-list-link text-primary text-weight-medium"
-              class="row col-12 text-dark q-py-xs q-pl-sm rounded-borders my-list"
+              class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list"
             >
-              <q-item-section>
-                <div>
-                  <q-item-label lines="1" class="text-weight-medium"
-                    >{{ prop.node.orgTreeName }}
-                    <q-btn
-                      v-if="store.typeOrganizational === 'draft'"
-                      flat
-                      dense
-                      color="secondary"
-                      icon="mdi-dots-horizontal-circle-outline"
-                      round
-                      dene
-                      class="q-ml-xs"
-                    >
-                      <q-menu>
-                        <q-list
-                          dense
-                          v-for="(item, index) in prop.node.orgLevel === 4
-                            ? listAdd.slice(1, 6)
-                            : listAdd"
-                          :key="index"
-                          style="min-width: 100px"
-                        >
-                          <q-item
-                            clickable
-                            v-close-popup
-                            @click="
-                              item.type === 'EDIT'
-                                ? onClickEdit(prop.node)
-                                : item.type === 'ADD'
-                                ? onClickAgency(
-                                    prop.node.orgLevel + 1,
-                                    prop.node
-                                  )
-                                : item.type === 'DETAIL'
-                                ? onClickDetail(
-                                    prop.node.orgTreeId,
-                                    prop.node.orgLevel
-                                  )
-                                : item.type === 'DEL'
-                                ? onClickDel(
-                                    prop.node.orgLevel,
-                                    prop.node.orgTreeId,
-                                    prop.node.orgRootId
-                                  )
-                                : item.type === 'SORT'
-                                ? onClickSort(
-                                    prop.node.orgRootId,
-                                    prop.node.orgLevel
-                                  )
-                                : item.type === 'HISTORY'
-                                ? onClickHistory(
-                                    prop.node.orgLevel,
-                                    prop.node.orgTreeId
-                                  )
-                                : null
-                            "
-                          >
-                            <q-item-section avatar style="min-width: 20px">
-                              <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-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>
-                    </q-btn>
-
-                    <q-btn
-                      v-else
-                      flat
-                      dense
-                      color="secondary"
-                      icon="mdi-dots-horizontal-circle-outline"
-                      round
-                      class="q-pa-none q-ml-xs"
-                    >
-                      <q-menu>
-                        <q-list
-                          dense
-                          v-for="(item, index) in listAdd.slice(5, 6)"
-                          :key="index"
-                          style="min-width: 100px"
-                        >
-                          <q-item
-                            clickable
-                            v-close-popup
-                            @click="
-                              onClickDetail(
-                                prop.node.orgTreeId,
-                                prop.node.orgLevel
-                              )
-                            "
-                          >
-                            <q-item-section avatar style="min-width: 20px">
-                              <q-icon
-                                size="17px"
-                                :color="item.color"
-                                :name="item.icon"
-                              />
-                            </q-item-section>
-                            <q-item-section>{{ item.label }}</q-item-section>
-                          </q-item>
-                        </q-list>
-                      </q-menu>
-                    </q-btn>
-                  </q-item-label>
+              <div>
+                <div class="text-weight-medium">
+                  {{ prop.node.orgTreeName }}
                 </div>
                 <div class="text-weight-light text-grey-8">
                   {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
@@ -591,7 +442,144 @@ watch(
                       : prop.node.orgTreeShortName
                   }}
                 </div>
-              </q-item-section>
+              </div>
+
+              <q-btn
+                v-if="store.typeOrganizational === 'draft'"
+                flat
+                dense
+                color="grey-13"
+                icon="mdi-dots-vertical"
+                round
+                class="q-ml-xs"
+              >
+                <q-menu>
+                  <q-list
+                    dense
+                    v-for="(item, index) in prop.node.orgLevel === 4
+                      ? listAdd.slice(1, 6)
+                      : listAdd"
+                    :key="index"
+                    style="min-width: 100px"
+                  >
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="
+                        item.type === 'EDIT'
+                          ? onClickEdit(prop.node)
+                          : item.type === 'ADD'
+                          ? onClickAgency(prop.node.orgLevel + 1, prop.node)
+                          : item.type === 'DETAIL'
+                          ? onClickDetail(
+                              prop.node.orgTreeId,
+                              prop.node.orgLevel
+                            )
+                          : item.type === 'DEL'
+                          ? onClickDel(
+                              prop.node.orgLevel,
+                              prop.node.orgTreeId,
+                              prop.node.orgRootId
+                            )
+                          : item.type === 'SORT'
+                          ? onClickSort(prop.node.orgRootId, prop.node.orgLevel)
+                          : item.type === 'HISTORY'
+                          ? onClickHistory(
+                              prop.node.orgLevel,
+                              prop.node.orgTreeId
+                            )
+                          : null
+                      "
+                    >
+                      <q-item-section avatar style="min-width: 20px">
+                        <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-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>
+              </q-btn>
+
+              <q-btn
+                v-else
+                flat
+                dense
+                color="grey-13"
+                icon="mdi-dots-vertical"
+                round
+              >
+                <q-menu>
+                  <q-list
+                    dense
+                    v-for="(item, index) in listAdd.slice(5, 6)"
+                    :key="index"
+                    style="min-width: 100px"
+                  >
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="
+                        onClickDetail(prop.node.orgTreeId, prop.node.orgLevel)
+                      "
+                    >
+                      <q-item-section avatar style="min-width: 20px">
+                        <q-icon
+                          size="xs"
+                          :color="item.color"
+                          :name="item.icon"
+                        />
+                      </q-item-section>
+                      <q-item-section>{{ item.label }}</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </q-btn>
             </q-item>
           </template>
         </q-tree>