From cda9e5623969c6ddc298f2bfecb774901c78f3f7 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 6 Feb 2024 15:00:24 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20layout?=
 =?UTF-8?q?=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogMovePos.vue              | 128 ++++++++++--------
 .../components/tableTree.vue                  |   8 +-
 2 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue
index fe44ad51a..792d871c5 100644
--- a/src/modules/02_organizationalNew/components/DialogMovePos.vue
+++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue
@@ -126,66 +126,12 @@ watch(
       <q-separator />
 
       <q-card-section class="q-pt-none bg-grey-2 q-pa-md">
-        <div class="row">
-          <q-card
-            class="col-12 col-sm-3 scroll q-pa-sm"
-            style="max-height: 70vh"
-          >
-            <q-input
-              ref="filterRef"
-              dense
-              outlined
-              v-model="filterTree"
-              label="ค้นหา"
-            >
-              <template v-slot:append>
-                <q-icon
-                  v-if="filterTree !== ''"
-                  name="clear"
-                  class="cursor-pointer"
-                  @click="resetFilter"
-                />
-              </template>
-            </q-input>
-            <q-tree
-              class="q-pa-md q-gutter-sm"
-              dense
-              default-expand-all
-              selected-color="primary"
-              :nodes="nodeTree"
-              node-key="orgTreeId"
-              label-key="orgTreeName"
-              :filter="filterTree"
-              no-results-label="ไม่พบข้อมูลที่ค้นหา"
-              no-nodes-label="ไม่มีข้อมูล"
-              v-model:selected="selectedTree"
-            >
-              <template v-slot:default-header="prop">
-                <!--แสดงชื่อแผนก พิมพ์ตัวหนา คลิกแล้วกาง/หุบ Tree-->
-                <div
-                  class="row items-center q-px-xs q-pt-xs q-gutter-sm"
-                  @click="updateSelected(prop.node.orgLevel)"
-                >
-                  <div>
-                    <div class="text-weight-medium">
-                      {{ prop.node.orgTreeName }}
-                    </div>
-                    <div class="text-weight-light">
-                      {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
-                      {{
-                        prop.node.orgTreeShortName == null
-                          ? null
-                          : prop.node.orgTreeShortName
-                      }}
-                    </div>
-                  </div>
-                </div>
-              </template>
-            </q-tree>
-          </q-card>
-
-          <q-card class="col-12 col-sm-9 q-pa-sm">
+        <div class="row q-col-gutter-md">
+          <q-card bordered class="col-12 col-sm-8 q-pa-sm">
             <q-toolbar style="padding: 0">
+              <q-toolbar-title class="text-subtitle2 text-bold"
+                >เลือกตำแหน่งที่ต้องการย้าย</q-toolbar-title
+              >
               <q-space />
 
               <div>
@@ -240,6 +186,70 @@ watch(
               </template>
             </d-table>
           </q-card>
+
+          <q-card
+            bordered
+            class="col-12 col-sm-4 scroll q-pa-sm"
+            style="max-height: 70vh"
+          >
+            <q-toolbar style="padding: 0">
+              <q-toolbar-title class="text-subtitle2 text-bold"
+                >เลือกหน่วยงาน/ส่วนราชการปลายทาง</q-toolbar-title
+              >
+            </q-toolbar>
+
+            <q-input
+              ref="filterRef"
+              dense
+              outlined
+              v-model="filterTree"
+              label="ค้นหา"
+            >
+              <template v-slot:append>
+                <q-icon
+                  v-if="filterTree !== ''"
+                  name="clear"
+                  class="cursor-pointer"
+                  @click="resetFilter"
+                />
+              </template>
+            </q-input>
+            <q-tree
+              class="q-pa-md q-gutter-sm"
+              dense
+              default-expand-all
+              selected-color="primary"
+              :nodes="nodeTree"
+              node-key="orgTreeId"
+              label-key="orgTreeName"
+              :filter="filterTree"
+              no-results-label="ไม่พบข้อมูลที่ค้นหา"
+              no-nodes-label="ไม่มีข้อมูล"
+              v-model:selected="selectedTree"
+            >
+              <template v-slot:default-header="prop">
+                <!--แสดงชื่อแผนก พิมพ์ตัวหนา คลิกแล้วกาง/หุบ Tree-->
+                <div
+                  class="row items-center q-px-xs q-pt-xs q-gutter-sm"
+                  @click="updateSelected(prop.node.orgLevel)"
+                >
+                  <div>
+                    <div class="text-weight-medium">
+                      {{ prop.node.orgTreeName }}
+                    </div>
+                    <div class="text-weight-light">
+                      {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
+                      {{
+                        prop.node.orgTreeShortName == null
+                          ? null
+                          : prop.node.orgTreeShortName
+                      }}
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </q-tree>
+          </q-card>
         </div>
       </q-card-section>
       <q-separator />
diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue
index eda46d2a3..3a3e58094 100644
--- a/src/modules/02_organizationalNew/components/tableTree.vue
+++ b/src/modules/02_organizationalNew/components/tableTree.vue
@@ -150,7 +150,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionIsSelected",
     align: "left",
-    label: "มีคนครองหรือไม่",
+    label: "คนครอง",
     sortable: true,
     field: "positionIsSelected",
     headerStyle: "font-size: 14px",
@@ -429,12 +429,12 @@ function updatePagination(newPagination: NewPagination) {
           <q-td>
             <q-btn
               flat
-              size="12px"
-              color="grey-8"
+              size="14px"
+              color="primary"
               round
               dense
               @click="props.expand = !props.expand"
-              :icon="props.expand ? 'mdi-menu-up' : 'mdi-menu-down'"
+              :icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
             />
           </q-td>
           <q-td v-for="col in props.cols" :key="col.name" :props="props">