From bcb8f670b26476792dfe09bccd5f3f94e3a76904 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 23 Jul 2024 15:45:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2=20?=
 =?UTF-8?q?=E0=B9=84=E0=B8=AD=E0=B8=84=E0=B8=AD=E0=B8=99=20=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AB=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/calendar/CalendarList.vue      | 44 ++++++++---------
 .../components/insignia/InsigniaList.vue      | 47 ++++++++++---------
 .../components/insignia/InsigniaType.vue      | 43 ++++++++---------
 .../components/personal/01ListPrefix.vue      |  8 ++--
 .../components/personal/02ListRank.vue        | 12 ++---
 .../components/personal/03ListBloodGroup.vue  | 12 ++---
 .../components/personal/04ListGender.vue      | 12 ++---
 .../components/personal/05ListReligion.vue    | 12 ++---
 .../personal/06ListRelationship.vue           | 12 ++---
 .../personal/07ListEducationLevel.vue         | 12 ++---
 .../components/personal/08ListProvince.vue    | 20 ++++----
 .../personal/province/01_District.vue         | 20 ++++----
 .../personal/province/02_SubDistrict.vue      | 12 ++---
 .../position-employee/01ListPosition.vue      | 21 +++++----
 .../position-employee/02ListType.vue          | 11 ++---
 .../position-employee/03ListLevel.vue         | 25 +++++-----
 .../components/position/01ListPosition.vue    | 46 +++++++++---------
 .../components/position/02ListType.vue        |  9 ++--
 .../components/position/04ListExecutive.vue   | 18 +++----
 .../components/position/05ListLevelDetail.vue | 24 +++++-----
 20 files changed, 210 insertions(+), 210 deletions(-)

diff --git a/src/modules/01_metadata/components/calendar/CalendarList.vue b/src/modules/01_metadata/components/calendar/CalendarList.vue
index a7f27271..694e83c4 100644
--- a/src/modules/01_metadata/components/calendar/CalendarList.vue
+++ b/src/modules/01_metadata/components/calendar/CalendarList.vue
@@ -36,17 +36,6 @@
         >
           <template v-slot:body="props">
             <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div v-if="col.name == 'week'" class="">
-                  {{ dayThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else-if="col.name == 'holidayDate'" class="">
-                  {{ dateThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else class="my-table-details">
-                  {{ col.value }}
-                </div>
-              </q-td>
               <q-td auto-width>
                 <q-btn
                   flat
@@ -80,6 +69,17 @@
                   </q-menu>
                 </q-btn>
               </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <div v-if="col.name == 'week'" class="">
+                  {{ dayThaiRange(props.row.dateRange) }}
+                </div>
+                <div v-else-if="col.name == 'holidayDate'" class="">
+                  {{ dateThaiRange(props.row.dateRange) }}
+                </div>
+                <div v-else class="my-table-details">
+                  {{ col.value }}
+                </div>
+              </q-td>
             </q-tr>
           </template>
         </q-table>
@@ -100,17 +100,6 @@
         >
           <template v-slot:body="props">
             <q-tr :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div v-if="col.name == 'week'" class="">
-                  {{ dayThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else-if="col.name == 'holidayDate'" class="">
-                  {{ dateThaiRange(props.row.dateRange) }}
-                </div>
-                <div v-else class="my-table-details">
-                  {{ col.value }}
-                </div>
-              </q-td>
               <q-td auto-width>
                 <q-btn
                   flat
@@ -144,6 +133,17 @@
                   </q-menu>
                 </q-btn>
               </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <div v-if="col.name == 'week'" class="">
+                  {{ dayThaiRange(props.row.dateRange) }}
+                </div>
+                <div v-else-if="col.name == 'holidayDate'" class="">
+                  {{ dateThaiRange(props.row.dateRange) }}
+                </div>
+                <div v-else class="my-table-details">
+                  {{ col.value }}
+                </div>
+              </q-td>
             </q-tr>
           </template>
         </q-table>
diff --git a/src/modules/01_metadata/components/insignia/InsigniaList.vue b/src/modules/01_metadata/components/insignia/InsigniaList.vue
index 373777de..2cdd6e45 100644
--- a/src/modules/01_metadata/components/insignia/InsigniaList.vue
+++ b/src/modules/01_metadata/components/insignia/InsigniaList.vue
@@ -332,36 +332,14 @@ const dialogOrder = ref<boolean>(false);
     >
       <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-bold">{{ 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, index) in props.cols" :key="col.id">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else-if="col.name == 'isActive'">
-              <q-icon
-                v-if="col.value == false"
-                name="mdi-close"
-                color="red"
-                class="text-h5"
-              />
-              <q-icon
-                v-else
-                name="mdi-check"
-                color="positive"
-                class="text-h5"
-              />
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="edit"
@@ -402,6 +380,29 @@ const dialogOrder = ref<boolean>(false);
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn> -->
           </q-td>
+          <q-td v-for="(col, index) in props.cols" :key="col.id">
+            <div v-if="col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+            <div v-else-if="col.name == 'isActive'">
+              <q-icon
+                v-if="col.value == false"
+                name="mdi-close"
+                color="red"
+                class="text-h5"
+              />
+              <q-icon
+                v-else
+                name="mdi-check"
+                color="positive"
+                class="text-h5"
+              />
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
+
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/01_metadata/components/insignia/InsigniaType.vue b/src/modules/01_metadata/components/insignia/InsigniaType.vue
index d3aaf04f..90700c5a 100644
--- a/src/modules/01_metadata/components/insignia/InsigniaType.vue
+++ b/src/modules/01_metadata/components/insignia/InsigniaType.vue
@@ -249,10 +249,10 @@ async function onSubmit() {
     >
       <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">
@@ -261,26 +261,7 @@ async function onSubmit() {
           class="cursor-pointer"
           @click.stop="onclickDetail(props.row.id)"
         >
-          <q-td v-for="col in props.cols" :key="col.id">
-            <div v-if="col.name == 'isActive'">
-              <q-icon
-                v-if="col.value == false"
-                name="mdi-close"
-                color="red"
-                class="text-h5"
-              />
-              <q-icon
-                v-else
-                name="mdi-check"
-                color="positive"
-                class="text-h5"
-              />
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
-          <q-td auto-width>
+        <q-td auto-width>
             <q-btn
               color="edit"
               flat
@@ -318,6 +299,26 @@ async function onSubmit() {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.id">
+            <div v-if="col.name == 'isActive'">
+              <q-icon
+                v-if="col.value == false"
+                name="mdi-close"
+                color="red"
+                class="text-h5"
+              />
+              <q-icon
+                v-else
+                name="mdi-check"
+                color="positive"
+                class="text-h5"
+              />
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
+
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/01_metadata/components/personal/01ListPrefix.vue b/src/modules/01_metadata/components/personal/01ListPrefix.vue
index ffb4d120..330e8d55 100644
--- a/src/modules/01_metadata/components/personal/01ListPrefix.vue
+++ b/src/modules/01_metadata/components/personal/01ListPrefix.vue
@@ -200,17 +200,14 @@ onMounted(async () => {
   >
     <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.id">
-          {{ col.value }}
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -248,6 +245,9 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          {{ col.value }}
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/02ListRank.vue b/src/modules/01_metadata/components/personal/02ListRank.vue
index 68ee4964..a81a3bb8 100644
--- a/src/modules/01_metadata/components/personal/02ListRank.vue
+++ b/src/modules/01_metadata/components/personal/02ListRank.vue
@@ -196,19 +196,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -246,6 +241,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/03ListBloodGroup.vue b/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
index d68ea7ef..d60f2c0c 100644
--- a/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
+++ b/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
@@ -196,19 +196,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -246,6 +241,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/04ListGender.vue b/src/modules/01_metadata/components/personal/04ListGender.vue
index d7423f5c..241c842d 100644
--- a/src/modules/01_metadata/components/personal/04ListGender.vue
+++ b/src/modules/01_metadata/components/personal/04ListGender.vue
@@ -196,19 +196,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -246,6 +241,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/05ListReligion.vue b/src/modules/01_metadata/components/personal/05ListReligion.vue
index cba4d351..6fa6c229 100644
--- a/src/modules/01_metadata/components/personal/05ListReligion.vue
+++ b/src/modules/01_metadata/components/personal/05ListReligion.vue
@@ -196,19 +196,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -246,6 +241,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/06ListRelationship.vue b/src/modules/01_metadata/components/personal/06ListRelationship.vue
index ff5b17ee..54441dfc 100644
--- a/src/modules/01_metadata/components/personal/06ListRelationship.vue
+++ b/src/modules/01_metadata/components/personal/06ListRelationship.vue
@@ -224,19 +224,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -274,6 +269,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/07ListEducationLevel.vue b/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
index 76bb0c13..c6eb310c 100644
--- a/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
+++ b/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
@@ -210,19 +210,14 @@ onMounted(async () => {
   >
     <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.id">
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -261,6 +256,11 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/08ListProvince.vue b/src/modules/01_metadata/components/personal/08ListProvince.vue
index d3cfa9ea..9aeb2dfe 100644
--- a/src/modules/01_metadata/components/personal/08ListProvince.vue
+++ b/src/modules/01_metadata/components/personal/08ListProvince.vue
@@ -200,23 +200,14 @@ onMounted(async () => {
   >
     <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.id"
-          @click="nextPage(props.row.id)"
-        >
-          <div>
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -254,6 +245,15 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td
+          v-for="col in props.cols"
+          :key="col.id"
+          @click="nextPage(props.row.id)"
+        >
+          <div>
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/01_metadata/components/personal/province/01_District.vue b/src/modules/01_metadata/components/personal/province/01_District.vue
index 7a4b8347..6e458460 100644
--- a/src/modules/01_metadata/components/personal/province/01_District.vue
+++ b/src/modules/01_metadata/components/personal/province/01_District.vue
@@ -240,23 +240,14 @@ onMounted(async () => {
       >
         <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.id"
-              @click="nextPage(props.row.id)"
-            >
-              <div>
-                {{ col.value }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 color="edit"
@@ -294,6 +285,15 @@ onMounted(async () => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn>
             </q-td>
+            <q-td
+              v-for="col in props.cols"
+              :key="col.id"
+              @click="nextPage(props.row.id)"
+            >
+              <div>
+                {{ col.value }}
+              </div>
+            </q-td>
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/01_metadata/components/personal/province/02_SubDistrict.vue b/src/modules/01_metadata/components/personal/province/02_SubDistrict.vue
index 9cb668e6..78aada20 100644
--- a/src/modules/01_metadata/components/personal/province/02_SubDistrict.vue
+++ b/src/modules/01_metadata/components/personal/province/02_SubDistrict.vue
@@ -253,19 +253,14 @@ onMounted(async () => {
       >
         <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.id">
-              <div>
-                {{ col.value }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 color="edit"
@@ -304,6 +299,11 @@ onMounted(async () => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.id">
+              <div>
+                {{ col.value }}
+              </div>
+            </q-td>
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/01_metadata/components/position-employee/01ListPosition.vue b/src/modules/01_metadata/components/position-employee/01ListPosition.vue
index c20a291e..58f65a35 100644
--- a/src/modules/01_metadata/components/position-employee/01ListPosition.vue
+++ b/src/modules/01_metadata/components/position-employee/01ListPosition.vue
@@ -332,6 +332,7 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
           <q-th
             v-for="col in props.cols"
             :key="col.name"
@@ -340,20 +341,10 @@ onMounted(() => {
           >
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-          <q-th auto-width></q-th>
         </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">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-
-            <div v-else>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="blue-6"
@@ -399,6 +390,16 @@ onMounted(() => {
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+
+            <div v-else>
+              {{ col.value ? col.value : "-" }}
+            </div>
+          </q-td>
+
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/01_metadata/components/position-employee/02ListType.vue b/src/modules/01_metadata/components/position-employee/02ListType.vue
index a849a6ce..c3d20935 100644
--- a/src/modules/01_metadata/components/position-employee/02ListType.vue
+++ b/src/modules/01_metadata/components/position-employee/02ListType.vue
@@ -244,10 +244,10 @@ onMounted(() => {
   >
     <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">
@@ -256,9 +256,6 @@ onMounted(() => {
         class="cursor-pointer"
         @click.stop="onClickDetail(props.row.id)"
       >
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value ? col.value : "-" }}
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -285,6 +282,9 @@ onMounted(() => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          {{ col.value ? col.value : "-" }}
+        </q-td>
       </q-tr>
     </template>
   </d-table>
@@ -318,7 +318,6 @@ onMounted(() => {
               :rules="[(val) => val.length > 0 || 'กรุณากรอกชื่อกลุ่มงาน']"
               hide-bottom-space
               class="inputgreen"
-
             />
           </div>
 
@@ -334,7 +333,6 @@ onMounted(() => {
               hide-bottom-space
               :rules="[(val) => !!val || `${'กรุณากรอกอักษรย่อกลุ่มงาน'}`]"
               class="inputgreen"
-
             />
           </div>
 
@@ -353,7 +351,6 @@ onMounted(() => {
               hide-bottom-space
               mask="############"
               class="inputgreen"
-
             />
           </div>
         </q-card-section>
diff --git a/src/modules/01_metadata/components/position-employee/03ListLevel.vue b/src/modules/01_metadata/components/position-employee/03ListLevel.vue
index c851586f..39655a27 100644
--- a/src/modules/01_metadata/components/position-employee/03ListLevel.vue
+++ b/src/modules/01_metadata/components/position-employee/03ListLevel.vue
@@ -275,25 +275,14 @@ onMounted(() => {
       >
         <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-bold">{{ 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, index) in props.cols" :key="col.id">
-              <div v-if="col.name == 'no'">
-                {{ props.rowIndex + 1 }}
-              </div>
-              <div v-else-if="col.name === 'posLevelAuthority'">
-                {{ col.value ? convertPosLevelAuthority(col.value) : "-" }}
-              </div>
-              <div v-else>
-                {{ col.value }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 color="edit"
@@ -319,6 +308,18 @@ onMounted(() => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn> -->
             </q-td>
+            <q-td v-for="(col, index) in props.cols" :key="col.id">
+              <div v-if="col.name == 'no'">
+                {{ props.rowIndex + 1 }}
+              </div>
+              <div v-else-if="col.name === 'posLevelAuthority'">
+                {{ col.value ? convertPosLevelAuthority(col.value) : "-" }}
+              </div>
+              <div v-else>
+                {{ col.value }}
+              </div>
+            </q-td>
+
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/01_metadata/components/position/01ListPosition.vue b/src/modules/01_metadata/components/position/01ListPosition.vue
index 96381387..3bd4f919 100644
--- a/src/modules/01_metadata/components/position/01ListPosition.vue
+++ b/src/modules/01_metadata/components/position/01ListPosition.vue
@@ -333,6 +333,7 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
           <q-th
             v-for="col in props.cols"
             :key="col.name"
@@ -341,33 +342,10 @@ onMounted(() => {
           >
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-          <q-th auto-width></q-th>
         </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="addPosition(props.row)"
-          >
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else-if="col.name === 'posLevelName'">
-              {{
-                props.row.posLevelName
-                  ? props.row.isSpecial == true
-                    ? `${props.row.posLevelName} (ฉ)`
-                    : props.row.posLevelName
-                  : "-"
-              }}
-            </div>
-            <div v-else>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="blue-6"
@@ -413,6 +391,28 @@ onMounted(() => {
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
+          <q-td
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+            @click="addPosition(props.row)"
+          >
+            <div v-if="col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+            <div v-else-if="col.name === 'posLevelName'">
+              {{
+                props.row.posLevelName
+                  ? props.row.isSpecial == true
+                    ? `${props.row.posLevelName} (ฉ)`
+                    : props.row.posLevelName
+                  : "-"
+              }}
+            </div>
+            <div v-else>
+              {{ col.value ? col.value : "-" }}
+            </div>
+          </q-td>
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/01_metadata/components/position/02ListType.vue b/src/modules/01_metadata/components/position/02ListType.vue
index 405c0e77..a17cb369 100644
--- a/src/modules/01_metadata/components/position/02ListType.vue
+++ b/src/modules/01_metadata/components/position/02ListType.vue
@@ -244,10 +244,10 @@ async function onSubmit() {
   >
     <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">
@@ -256,9 +256,6 @@ async function onSubmit() {
         class="cursor-pointer"
         @click.stop="onclickDetail(props.row.id)"
       >
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value }}
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -297,6 +294,9 @@ async function onSubmit() {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          {{ col.value }}
+        </q-td>
       </q-tr>
     </template>
   </d-table>
@@ -341,7 +341,6 @@ async function onSubmit() {
               hide-bottom-space
               mask="############"
               class="inputgreen"
-
             />
           </div>
         </q-card-section>
diff --git a/src/modules/01_metadata/components/position/04ListExecutive.vue b/src/modules/01_metadata/components/position/04ListExecutive.vue
index c775f693..38e506de 100644
--- a/src/modules/01_metadata/components/position/04ListExecutive.vue
+++ b/src/modules/01_metadata/components/position/04ListExecutive.vue
@@ -175,6 +175,7 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
           <q-th
             v-for="col in props.cols"
             :key="col.name"
@@ -183,19 +184,10 @@ onMounted(() => {
           >
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-          <q-th auto-width></q-th>
         </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">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="edit"
@@ -228,6 +220,14 @@ onMounted(() => {
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn> -->
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/01_metadata/components/position/05ListLevelDetail.vue b/src/modules/01_metadata/components/position/05ListLevelDetail.vue
index 17348b52..38d2218e 100644
--- a/src/modules/01_metadata/components/position/05ListLevelDetail.vue
+++ b/src/modules/01_metadata/components/position/05ListLevelDetail.vue
@@ -306,25 +306,14 @@ onMounted(async () => {
     >
       <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-bold">{{ 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, index) in props.cols" :key="col.id">
-            <div v-if="col.name === 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-            <div v-if="col.name === 'posTypeName'">
-              {{ posName }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="edit"
@@ -371,6 +360,17 @@ onMounted(async () => {
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn> -->
           </q-td>
+          <q-td v-for="(col, index) in props.cols" :key="col.id">
+            <div v-if="col.name === 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+            <div v-if="col.name === 'posTypeName'">
+              {{ posName }}
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
         </q-tr>
       </template>
     </d-table>