From 389876efb30bc2cd053579fb35e0c54175cec002 Mon Sep 17 00:00:00 2001
From: Net <thanaphon@frappet.com>
Date: Mon, 15 Jul 2024 16:05:40 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=81?=
 =?UTF-8?q?=E0=B8=94=E0=B8=94=E0=B8=B9=20=E0=B8=AA=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=B2=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=84=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/04_product-service/MainPage.vue | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index c2ae6b57..73254d06 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -1410,7 +1410,7 @@ watch(inputSearchProductAndService, async () => {
                         if (node.type === 'group' && node._count.type > 0) {
                           pathGroupName = node.name;
                           currentId = node.id;
-                          productMode = 'type';
+
                           await fetchListType();
                           expandedTree.push(node.id);
                           flowStore.rotate();
@@ -1421,6 +1421,8 @@ watch(inputSearchProductAndService, async () => {
                     :class="{
                       'cursor-pointer':
                         node.type === 'group' && node._count.type > 0,
+                      'selector-tree':
+                        node.type === 'group' && node._count.type > 0,
                     }"
                   >
                     <div class="col row full-width">
@@ -3125,17 +3127,15 @@ watch(inputSearchProductAndService, async () => {
     v-model:drawerOpen="drawerInfo"
     :title="
       $t(
-        editByTree !== undefined
-          ? editByTree === 'group'
-            ? 'productGroup'
-            : editByTree === 'type'
-              ? 'productType'
-              : undefined
-          : productMode === 'group'
-            ? 'productGroup'
-            : productMode === 'type'
-              ? 'productType'
-              : undefined,
+        editByTree === 'group'
+          ? 'productGroup'
+          : editByTree === 'type'
+            ? 'productType'
+            : productMode === 'group'
+              ? 'productGroup'
+              : productMode === 'type'
+                ? 'productType'
+                : 'defaultKey',
         {
           name: formDataGroup.code,
         },