From 5c847f0a68952f57e434432ba360a02313f43c88 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 20 Dec 2024 11:52:00 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organization/components/MainView.vue   | 41 +++++++++++--------
 .../16_positionEmployee/views/main.vue        | 39 +++++++++++-------
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/modules/02_organization/components/MainView.vue b/src/modules/02_organization/components/MainView.vue
index f4ba6ca58..bd35e4bd4 100644
--- a/src/modules/02_organization/components/MainView.vue
+++ b/src/modules/02_organization/components/MainView.vue
@@ -327,22 +327,31 @@ onMounted(async () => {
                 </div>
               </q-card>
 
-              <TreeTable
-                v-if="nodeId !== ''"
-                v-model:node-tree="nodeTree"
-                v-model:org-level="orgLevel"
-                v-model:tree-id="nodeId"
-                v-model:pos-master="posMaster"
-                v-model:req-master="reqMaster"
-                v-model:total-page="totalPage"
-                v-model:org-root-id="orgRootId"
-                v-model:total-data="totalData"
-                :short-name="shortName"
-                :main-tree="mainTree"
-                :fetch-data-table="fetchDataTable"
-                :filter-keyword="filterKeyword"
-                :fetch-data-tree="fetchDataTree"
-              />
+              <q-card
+                falt
+                bordered
+                class="q-mt-xs q-gutter-xs scroll"
+                style="height: 72vh"
+              >
+                <div class="q-pa-sm">
+                  <TreeTable
+                    v-if="nodeId !== ''"
+                    v-model:node-tree="nodeTree"
+                    v-model:org-level="orgLevel"
+                    v-model:tree-id="nodeId"
+                    v-model:pos-master="posMaster"
+                    v-model:req-master="reqMaster"
+                    v-model:total-page="totalPage"
+                    v-model:org-root-id="orgRootId"
+                    v-model:total-data="totalData"
+                    :short-name="shortName"
+                    :main-tree="mainTree"
+                    :fetch-data-table="fetchDataTable"
+                    :filter-keyword="filterKeyword"
+                    :fetch-data-tree="fetchDataTree"
+                  />
+                </div>
+              </q-card>
             </div>
             <div class="row col-12 items-center" v-else>
               <q-banner class="q-pa-lg col-12 text-center">
diff --git a/src/modules/16_positionEmployee/views/main.vue b/src/modules/16_positionEmployee/views/main.vue
index 7b64bc8c4..8fba3eb37 100644
--- a/src/modules/16_positionEmployee/views/main.vue
+++ b/src/modules/16_positionEmployee/views/main.vue
@@ -288,21 +288,30 @@ onMounted(() => {
                       </div>
                     </q-card>
 
-                    <TreeTable
-                      v-if="nodeId !== ''"
-                      v-model:node-tree="nodeTree"
-                      v-model:org-level="orgLevel"
-                      v-model:tree-id="nodeId"
-                      v-model:pos-master="posMaster"
-                      v-model:req-master="reqMaster"
-                      v-model:total-page="totalPage"
-                      v-model:total-data="totalData"
-                      :short-name="shortName"
-                      :main-tree="mainTree"
-                      :fetch-data-table="fetchDataTable"
-                      :fetch-data-tree="fetchDataTree"
-                      :filter-keyword="filterKeyword"
-                    />
+                    <q-card
+                      falt
+                      bordered
+                      class="q-mt-xs q-gutter-xs scroll"
+                      style="height: 72vh"
+                    >
+                      <div class="q-pa-sm">
+                        <TreeTable
+                          v-if="nodeId !== ''"
+                          v-model:node-tree="nodeTree"
+                          v-model:org-level="orgLevel"
+                          v-model:tree-id="nodeId"
+                          v-model:pos-master="posMaster"
+                          v-model:req-master="reqMaster"
+                          v-model:total-page="totalPage"
+                          v-model:total-data="totalData"
+                          :short-name="shortName"
+                          :main-tree="mainTree"
+                          :fetch-data-table="fetchDataTable"
+                          :fetch-data-tree="fetchDataTree"
+                          :filter-keyword="filterKeyword"
+                        />
+                      </div>
+                    </q-card>
                   </div>
                   <div class="row col-12 items-center" v-else>
                     <q-banner class="q-pa-lg col-12 text-center">