From 3b7175502bc6e9a228a8da368b9fbe28ae96a337 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Fri, 26 Jul 2024 16:25:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2=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/AppointEmployee/Main.vue       | 123 +++++++++---------
 .../components/ChangePosition/Main.vue        |  57 ++++----
 2 files changed, 91 insertions(+), 89 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/Main.vue b/src/modules/05_placement/components/AppointEmployee/Main.vue
index df0c5845e..bdb6a526a 100644
--- a/src/modules/05_placement/components/AppointEmployee/Main.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Main.vue
@@ -601,74 +601,14 @@ function onSave(data: any) {
           >
             <template v-slot:header="props">
               <q-tr :props="props">
+                <q-th auto-width />
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
-                <q-th auto-width />
               </q-tr>
             </template>
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  @click="nextPage(props.row.id)"
-                >
-                  <div v-if="col.name == 'no'">
-                    {{ props.rowIndex + 1 }}
-                  </div>
-                  <div v-else-if="col.name == 'fullname'">
-                    {{
-                      props.row.firstName
-                        ? `${props.row.prefix ?? ""}${
-                            props.row.firstName ?? ""
-                          } ${props.row.lastName ?? ""}`
-                        : "-"
-                    }}
-                  </div>
-
-                  <div v-else-if="col.name == 'status'">
-                    {{ props.row.status ? statusText(props.row.status) : "-" }}
-                  </div>
-                  <div v-else-if="col.name == 'dateOfBirth'">
-                    {{
-                      props.row.dateOfBirth
-                        ? date2Thai(props.row.dateOfBirth)
-                        : "-"
-                    }}
-                  </div>
-                  <div v-else-if="col.name == 'organizationName'">
-                    <div class="col-4">
-                      <div class="text-weight-medium">
-                        {{ props.row.root !== null ? props.row.root : "-" }}
-                        {{
-                          props.row.rootShortName !== null
-                            ? `(${props.row.rootShortName})`
-                            : ""
-                        }}
-                      </div>
-                      <div class="text-weight-light">
-                        {{
-                          props.row.nodeName !== null ? props.row.nodeName : ""
-                        }}
-                        {{
-                          props.row.nodeShortName !== null
-                            ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
-                            : ""
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div v-else-if="col.name == 'createdAt'">
-                    {{
-                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
-                    }}
-                  </div>
-                  <div v-else>
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
                 <q-td auto-width>
                   <q-btn
                     v-if="
@@ -764,6 +704,67 @@ function onSave(data: any) {
                     </q-menu>
                   </q-btn>
                 </q-td>
+                <q-td
+                  v-for="col in props.cols"
+                  :key="col.name"
+                  :props="props"
+                  @click="nextPage(props.row.id)"
+                >
+                  <div v-if="col.name == 'no'">
+                    {{ props.rowIndex + 1 }}
+                  </div>
+                  <div v-else-if="col.name == 'fullname'">
+                    {{
+                      props.row.firstName
+                        ? `${props.row.prefix ?? ""}${
+                            props.row.firstName ?? ""
+                          } ${props.row.lastName ?? ""}`
+                        : "-"
+                    }}
+                  </div>
+
+                  <div v-else-if="col.name == 'status'">
+                    {{ props.row.status ? statusText(props.row.status) : "-" }}
+                  </div>
+                  <div v-else-if="col.name == 'dateOfBirth'">
+                    {{
+                      props.row.dateOfBirth
+                        ? date2Thai(props.row.dateOfBirth)
+                        : "-"
+                    }}
+                  </div>
+                  <div v-else-if="col.name == 'organizationName'">
+                    <div class="col-4">
+                      <div class="text-weight-medium">
+                        {{ props.row.root !== null ? props.row.root : "-" }}
+                        {{
+                          props.row.rootShortName !== null
+                            ? `(${props.row.rootShortName})`
+                            : ""
+                        }}
+                      </div>
+                      <div class="text-weight-light">
+                        {{
+                          props.row.nodeName !== null ? props.row.nodeName : ""
+                        }}
+                        {{
+                          props.row.nodeShortName !== null
+                            ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
+                            : ""
+                        }}
+                      </div>
+                    </div>
+                  </div>
+                  <div v-else-if="col.name == 'createdAt'">
+                    {{
+                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
+                    }}
+                  </div>
+                  <div v-else>
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/components/ChangePosition/Main.vue b/src/modules/05_placement/components/ChangePosition/Main.vue
index 464258563..28cb75dc7 100644
--- a/src/modules/05_placement/components/ChangePosition/Main.vue
+++ b/src/modules/05_placement/components/ChangePosition/Main.vue
@@ -288,41 +288,14 @@ onMounted(() => {
             </template>
             <template v-slot:header="props">
               <q-tr :props="props">
+                <q-th auto-width />
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
-                <q-th auto-width />
               </q-tr>
             </template>
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  @click="personalListPage(props.row.id)"
-                >
-                  <div v-if="col.name == 'no'">
-                    {{
-                      (pagination.page - 1) * pagination.rowsPerPage +
-                      props.rowIndex +
-                      1
-                    }}
-                  </div>
-
-                  <div v-else-if="col.name == 'createdAt'">
-                    {{
-                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
-                    }}
-                  </div>
-
-                  <div v-else-if="col.name == 'status'">
-                    {{ props.row.status ? statusText(props.row.status) : "-" }}
-                  </div>
-
-                  <div v-else>
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
                 <q-td auto-width>
                   <q-btn
                     v-if="
@@ -374,6 +347,34 @@ onMounted(() => {
                     </q-menu>
                   </q-btn>
                 </q-td>
+                <q-td
+                  v-for="col in props.cols"
+                  :key="col.name"
+                  @click="personalListPage(props.row.id)"
+                >
+                  <div v-if="col.name == 'no'">
+                    {{
+                      (pagination.page - 1) * pagination.rowsPerPage +
+                      props.rowIndex +
+                      1
+                    }}
+                  </div>
+
+                  <div v-else-if="col.name == 'createdAt'">
+                    {{
+                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
+                    }}
+                  </div>
+
+                  <div v-else-if="col.name == 'status'">
+                    {{ props.row.status ? statusText(props.row.status) : "-" }}
+                  </div>
+
+                  <div v-else>
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+
               </q-tr>
             </template>
           </d-table>