From 86de5b29ae9ad2d6a1bd77e769ee4a588cd83b5b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 24 Jul 2024 23:44:47 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=20=E0=B8=97=E0=B8=B1=E0=B8=9A=E0=B8=97=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20"=E0=B8=99=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=97=E0=B8=B1=E0=B8=9A=E0=B8=95=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87"=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B9=84?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=84=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSelectPerson.vue         | 12 ++++----
 .../components/TreeTable.vue                  | 30 +++++++++++--------
 .../components/PersonalList/CardPosition.vue  |  6 ++--
 .../components/DialogSelectPos.vue            |  6 ++--
 .../components/DialogSelectPerson.vue         |  2 +-
 .../components/TreeTable.vue                  |  7 +++--
 6 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
index 3a6fb8e4e..40ca5d8da 100644
--- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
+++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
@@ -625,11 +625,11 @@ watch([() => page.value, () => pageSize.value], () => {
                   />
                   <div class="col-12">
                     <d-table
-                    ref="table"
-                    flat
-                    :columns="columnsResult"
-                    :rows="rowResult"
-                    row-key="id"
+                      ref="table"
+                      flat
+                      :columns="columnsResult"
+                      :rows="rowResult"
+                      row-key="id"
                       dense
                       class="custom-header-table"
                       :paging="true"
@@ -706,7 +706,7 @@ watch([() => page.value, () => pageSize.value], () => {
                 color="primary"
                 dense
                 v-model="isSit"
-                label="ทับที่"
+                label="นั่งทับตำแหน่ง"
               />
             </div>
           </div>
diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index f8f327051..7c8797c2d 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -572,17 +572,6 @@ watch(
       </template>
       <template v-slot:body="props">
         <q-tr :props="props" class="cursor-pointer">
-          <q-td>
-            <q-btn
-              flat
-              size="14px"
-              color="primary"
-              round
-              dense
-              @click="props.expand = !props.expand"
-              :icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
-            />
-          </q-td>
           <q-td>
             <q-btn
               flat
@@ -686,6 +675,18 @@ watch(
               </q-menu>
             </q-btn>
           </q-td>
+          <q-td>
+            <q-btn
+              flat
+              size="14px"
+              color="primary"
+              round
+              dense
+              @click="props.expand = !props.expand"
+              :icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
+            />
+          </q-td>
+
           <q-td v-for="col in props.cols" :key="col.name" :props="props">
             <div v-if="col.name == 'no'">
               {{
@@ -695,7 +696,11 @@ watch(
               }}
             </div>
             <div v-else-if="col.name === 'posMasterNo'">
-              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
+              {{
+                props.row.isSit
+                  ? col.value + " " + "(นั่งทับตำแหน่ง)"
+                  : col.value
+              }}
             </div>
             <div v-else-if="col.name === 'posLevelName'">
               {{
@@ -710,7 +715,6 @@ watch(
               {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
-
         </q-tr>
 
         <q-tr v-show="props.expand" :props="props">
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 47faf00f0..786d3006b 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -302,7 +302,9 @@ onMounted(async () => {
                   </div>
                   <div v-else-if="col.name === 'posMasterNo'">
                     {{
-                      props.row.isSit ? col.value + " " + "(ทับที่)" : col.value
+                      props.row.isSit
+                        ? col.value + " " + "(นั่งทับตำแหน่ง)"
+                        : col.value
                     }}
                   </div>
                   <div v-else-if="col.name === 'isPosition'">
@@ -438,7 +440,7 @@ onMounted(async () => {
                       <div v-else-if="col.name === 'posMasterNo'">
                         {{
                           props.row.isSit
-                            ? col.value + " " + "(ทับที่)"
+                            ? col.value + " " + "(นั่งทับตำแหน่ง)"
                             : col.value
                         }}
                       </div>
diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
index f92ac04f8..2871d53d1 100644
--- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue
+++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
@@ -669,7 +669,7 @@ watch(
                                 <div v-else-if="col.name === 'posMasterNo'">
                                   {{
                                     props.row.isSit
-                                      ? col.value + " " + "(ทับที่)"
+                                      ? col.value + " " + "(นั่งทับตำแหน่ง)"
                                       : col.value
                                   }}
                                 </div>
@@ -736,7 +736,7 @@ watch(
                                 <div v-else-if="col.name === 'posMasterNo'">
                                   {{
                                     props.row.isSit
-                                      ? col.value + " " + "(ทับที่)"
+                                      ? col.value + " " + "(นั่งทับตำแหน่ง)"
                                       : col.value
                                   }}
                                 </div>
@@ -884,7 +884,7 @@ watch(
                                     <div v-else-if="col.name === 'posMasterNo'">
                                       {{
                                         props.row.isSit
-                                          ? col.value + " " + "(ทับที่)"
+                                          ? col.value + " " + "(นั่งทับตำแหน่ง)"
                                           : col.value
                                       }}
                                     </div>
diff --git a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
index a84b50894..fb4038cdc 100644
--- a/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
+++ b/src/modules/16_positionEmployee/components/DialogSelectPerson.vue
@@ -672,7 +672,7 @@ watch([() => page.value, () => pageSize.value], () => {
                 color="primary"
                 dense
                 v-model="isSit"
-                label="ทับที่"
+                label="นั่งทับตำแหน่ง"
               />
             </div>
           </div>
diff --git a/src/modules/16_positionEmployee/components/TreeTable.vue b/src/modules/16_positionEmployee/components/TreeTable.vue
index cffa6ac77..e53b259e6 100644
--- a/src/modules/16_positionEmployee/components/TreeTable.vue
+++ b/src/modules/16_positionEmployee/components/TreeTable.vue
@@ -587,7 +587,11 @@ watch(
               }}
             </div>
             <div v-else-if="col.name === 'posMasterNo'">
-              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
+              {{
+                props.row.isSit
+                  ? col.value + " " + "(นั่งทับตำแหน่ง)"
+                  : col.value
+              }}
             </div>
             <div v-else-if="col.name === 'posLevelName'">
               {{
@@ -602,7 +606,6 @@ watch(
               {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
-
         </q-tr>
       </template>
       <template v-slot:pagination="scope">