From c3c11afd1f95a478608f9c63b89437606c4d5238 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 24 Jul 2024 16:37:04 +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

---
 .../competency/01ListCompetency.vue           |   9 +-
 .../competency/02ListLinkPosition.vue         |   9 +-
 .../components/competency/03ListLinkGroup.vue |  45 ++--
 .../01_metadataNew/views/Assignment.vue       |  13 +-
 .../01_metadataNew/views/indicatorByPlan.vue  |  13 +-
 .../01_metadataNew/views/indicatorByRole.vue  |  29 +--
 .../components/DialogFormPosition.vue         | 100 ++++----
 .../components/TreeTable.vue                  |  51 +++--
 .../03_recruiting/components/Career.vue       |  29 +--
 .../03_recruiting/components/Table.vue        |   2 +-
 .../03_recruiting/components/Table1.vue       |   5 +-
 .../03_recruiting/components/TableCan.vue     |   4 +-
 .../03_recruiting/interface/request/Period.ts |   1 +
 .../interface/response/Period.ts              |   1 +
 .../03_recruiting/views/01_compete/Period.vue |  72 +++---
 .../views/02_qualify/DisablePeriod.vue        |  71 +++---
 .../03_recruiting/views/02_qualify/Period.vue |  28 +--
 .../views/02_qualify/PeriodAdd.vue            |  24 +-
 .../04_registry/interface/index/Main.ts       |   2 +-
 .../Achievement/01_ProfessionalLicense.vue    |  13 +-
 .../detail/Achievement/02_Train.vue           |  13 +-
 .../detail/Achievement/03_Insignia.vue        |  23 +-
 .../Achievement/04_DeclarationHonor.vue       |  23 +-
 .../Achievement/05_ResultsPerformance.vue     |  23 +-
 .../detail/Employee/02_Employment.vue         |  18 +-
 .../GovernmentInformation/02_Discipline.vue   |  23 +-
 .../detail/GovernmentInformation/03_Leave.vue |  39 ++--
 .../04_PerformSpecialWork.vue                 |  25 +-
 .../detail/Other/01_OtherInformation.vue      |  13 +-
 .../02_NameChangeHistory.vue                  |  12 +-
 .../PersonalInformation/05_Education.vue      |  13 +-
 .../PersonalInformation/06_SpecialSkill.vue   |   9 +-
 .../detail/Salary/01_PositionSalary.vue       |  13 +-
 .../detail/Salary/02_NotReceiveSalary.vue     |   8 +-
 .../components/AppointMent/Main.vue           | 123 +++++-----
 .../05_placement/components/Other/Main.vue    |  41 ++--
 .../components/PersonalList/Table.vue         | 213 +++++++++---------
 .../components/PersonalList/TableView.vue     |   2 +-
 .../components/Receive/receiveMain.vue        | 121 +++++-----
 .../components/Repatriate/RepatriateMain.vue  |  43 ++--
 .../components/helpgovernment/mainHelp.vue    |  43 ++--
 .../components/DismissOrder/DismissOrder.vue  |  37 +--
 .../components/ExitInterview/exitMain.vue     |  31 +--
 .../components/1_Proposals/listProposals.vue  |  26 ++-
 .../07_insignia/components/2_Manage/Tab1.vue  | 194 ++++++++--------
 .../07_insignia/components/2_Manage/Tab2.vue  |  32 +--
 .../07_insignia/components/2_Manage/Tab3.vue  |  30 +--
 .../components/4_Allocate/Main.vue            |  88 ++++----
 .../07_insignia/components/5_Borrow/Main.vue  |  16 +-
 src/modules/07_insignia/views/ResultPage.vue  |  16 +-
 .../08_registryEmployee/views/Main.vue        |  82 +++----
 .../09_leave/components/1_Work/TableList.vue  |  27 +--
 .../09_leave/views/ChangeRoundMain.vue        |  14 +-
 src/modules/09_leave/views/RoundMain.vue      |  25 +-
 .../09_leave/views/SpecialTimeMain.vue        |  39 ++--
 .../components/DialogFormPosition.vue         |  74 +++---
 .../components/TreeTable.vue                  |  51 +++--
 src/modules/17_acting/views/main.vue          |  27 +--
 58 files changed, 1115 insertions(+), 1056 deletions(-)

diff --git a/src/modules/01_metadataNew/components/competency/01ListCompetency.vue b/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
index bd81c578b..0072f4f67 100644
--- a/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
+++ b/src/modules/01_metadataNew/components/competency/01ListCompetency.vue
@@ -212,17 +212,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-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"
@@ -251,6 +248,10 @@ onMounted(() => {
             <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>
     <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue b/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
index d2a865332..a07dce629 100644
--- a/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
+++ b/src/modules/01_metadataNew/components/competency/02ListLinkPosition.vue
@@ -258,17 +258,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"
@@ -299,6 +296,10 @@ 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>
     <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue b/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
index 287355ad3..b496d64d1 100644
--- a/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
+++ b/src/modules/01_metadataNew/components/competency/03ListLinkGroup.vue
@@ -398,35 +398,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" class="vertical-top">
-          <div v-if="col.name == 'positions'">
-            <div v-if="col.value.length !== 0">
-              <div v-for="(pos, index) in col.value" :key="pos.id">
-                {{ pos ? `- ${pos.name}` : "-" }}
-              </div>
-            </div>
-            <div v-else>-</div>
-          </div>
-          <div v-else-if="col.name == 'capacitys'">
-            <div v-if="col.value.length !== 0">
-              <div v-for="competency in col.value" :key="competency.id">
-                {{ competency ? `- ${competency.name}` : "-" }}
-              </div>
-            </div>
-            <div v-else>-</div>
-          </div>
-          <div v-else>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -457,6 +436,28 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id" class="vertical-top">
+          <div v-if="col.name == 'positions'">
+            <div v-if="col.value.length !== 0">
+              <div v-for="(pos, index) in col.value" :key="pos.id">
+                {{ pos ? `- ${pos.name}` : "-" }}
+              </div>
+            </div>
+            <div v-else>-</div>
+          </div>
+          <div v-else-if="col.name == 'capacitys'">
+            <div v-if="col.value.length !== 0">
+              <div v-for="competency in col.value" :key="competency.id">
+                {{ competency ? `- ${competency.name}` : "-" }}
+              </div>
+            </div>
+            <div v-else>-</div>
+          </div>
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/views/Assignment.vue b/src/modules/01_metadataNew/views/Assignment.vue
index 6c861b8e7..b95cd6fec 100644
--- a/src/modules/01_metadataNew/views/Assignment.vue
+++ b/src/modules/01_metadataNew/views/Assignment.vue
@@ -256,19 +256,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-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">
-              <div class="table_ellipsis">
-                {{ col.value ? col.value : "-" }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 flat
@@ -291,6 +286,12 @@ onMounted(() => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div class="table_ellipsis">
+                {{ col.value ? col.value : "-" }}
+              </div>
+            </q-td>
+
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/01_metadataNew/views/indicatorByPlan.vue b/src/modules/01_metadataNew/views/indicatorByPlan.vue
index 85dd2e290..dd4ddf176 100644
--- a/src/modules/01_metadataNew/views/indicatorByPlan.vue
+++ b/src/modules/01_metadataNew/views/indicatorByPlan.vue
@@ -404,19 +404,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-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">
-                  <div class="table_ellipsis">
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
                 <q-td auto-width>
                   <q-btn
                     flat
@@ -481,6 +476,12 @@ onMounted(() => {
                     </q-menu>
                   </q-btn>
                 </q-td>
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                  <div class="table_ellipsis">
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/01_metadataNew/views/indicatorByRole.vue b/src/modules/01_metadataNew/views/indicatorByRole.vue
index d3704e33b..31c75e431 100644
--- a/src/modules/01_metadataNew/views/indicatorByRole.vue
+++ b/src/modules/01_metadataNew/views/indicatorByRole.vue
@@ -409,27 +409,14 @@ onMounted(async () => {
         </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" :props="props">
-              <div v-if="col.name === 'no'">
-                {{
-                  (formFilter.page - 1) * Number(pagination.rowsPerPage) +
-                  props.rowIndex +
-                  1
-                }}
-              </div>
-
-              <div v-else class="table_ellipsis">
-                {{ col.value ? col.value : "-" }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 flat
@@ -494,6 +481,20 @@ onMounted(async () => {
                 </q-menu>
               </q-btn>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div v-if="col.name === 'no'">
+                {{
+                  (formFilter.page - 1) * Number(pagination.rowsPerPage) +
+                  props.rowIndex +
+                  1
+                }}
+              </div>
+
+              <div v-else class="table_ellipsis">
+                {{ col.value ? col.value : "-" }}
+              </div>
+            </q-td>
+
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index 43521a7b9..34b900283 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -719,6 +719,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
                     >
                       <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"
@@ -729,11 +730,22 @@ async function emitSearch(keyword: string, typeSelect: string) {
                               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 auto-width>
+                            <q-btn
+                              flat
+                              dense
+                              icon="mdi-delete"
+                              class="q-pa-none q-ml-xs"
+                              color="red"
+                              @click="deleteData(props.row.id)"
+                            >
+                              <q-tooltip>ลบข้อมูล</q-tooltip>
+                            </q-btn>
+                          </q-td>
                           <q-td
                             v-for="col in props.cols"
                             :key="col.name"
@@ -767,18 +779,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
                               {{ col.value }}
                             </div>
                           </q-td>
-                          <q-td auto-width>
-                            <q-btn
-                              flat
-                              dense
-                              icon="mdi-delete"
-                              class="q-pa-none q-ml-xs"
-                              color="red"
-                              @click="deleteData(props.row.id)"
-                            >
-                              <q-tooltip>ลบข้อมูล</q-tooltip>
-                            </q-btn>
-                          </q-td>
+
                         </q-tr>
                       </template>
                     </d-table>
@@ -892,6 +893,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
                     >
                       <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"
@@ -902,46 +904,10 @@ async function emitSearch(keyword: string, typeSelect: string) {
                               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 === 'posExecutiveName'">
-                              {{ col.value ? col.value : "-" }}
-                            </div>
-
-                            <div
-                              v-else-if="col.name === 'positionExecutiveField'"
-                            >
-                              {{ col.value ? col.value : "-" }}
-                            </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-if="col.name === 'positionArea'">
-                              {{ col.value ? col.value : "-" }}
-                            </div>
-                            <div v-else>
-                              {{ col.value }}
-                            </div>
-                          </q-td>
                           <q-td auto-width>
                             <q-btn
                               flat
@@ -982,6 +948,42 @@ async function emitSearch(keyword: string, typeSelect: string) {
                               </q-menu>
                             </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 === 'posExecutiveName'">
+                              {{ col.value ? col.value : "-" }}
+                            </div>
+
+                            <div
+                              v-else-if="col.name === 'positionExecutiveField'"
+                            >
+                              {{ col.value ? col.value : "-" }}
+                            </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-if="col.name === 'positionArea'">
+                              {{ col.value ? col.value : "-" }}
+                            </div>
+                            <div v-else>
+                              {{ col.value }}
+                            </div>
+                          </q-td>
+
                         </q-tr>
                       </template>
                     </d-table>
diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index fc4f74303..f8f327051 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -563,11 +563,11 @@ watch(
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
           <q-th auto-width></q-th>
           <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-th>
         </q-tr>
       </template>
       <template v-slot:body="props">
@@ -583,30 +583,6 @@ watch(
               :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'">
-              {{
-                (reqMaster.page - 1) * Number(reqMaster.pageSize) +
-                props.rowIndex +
-                1
-              }}
-            </div>
-            <div v-else-if="col.name === 'posMasterNo'">
-              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
-            </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>
             <q-btn
               flat
@@ -710,6 +686,31 @@ watch(
               </q-menu>
             </q-btn>
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{
+                (reqMaster.page - 1) * Number(reqMaster.pageSize) +
+                props.rowIndex +
+                1
+              }}
+            </div>
+            <div v-else-if="col.name === 'posMasterNo'">
+              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
+            </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>
 
         <q-tr v-show="props.expand" :props="props">
diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue
index 744a0ca97..dc678e697 100644
--- a/src/modules/03_recruiting/components/Career.vue
+++ b/src/modules/03_recruiting/components/Career.vue
@@ -17,23 +17,10 @@
       :editData="status == 'checkRegister' || status == 'payment'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
+      :iconLeft="true"
     >
       <template #columns="props">
         <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props)"
-            class="cursor-pointer"
-          >
-            <div v-if="col.name == 'startDate' || col.name == 'endDate'">
-              {{ date2Thai(col.value) }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
           <q-td
             style="width: 5% !important"
             v-if="status == 'checkRegister' || status == 'payment'"
@@ -48,6 +35,20 @@
               @click="checkDelete(props.row)"
             />
           </q-td>
+          <q-td
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+            @click="selectData(props)"
+            class="cursor-pointer"
+          >
+            <div v-if="col.name == 'startDate' || col.name == 'endDate'">
+              {{ date2Thai(col.value) }}
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
         </q-tr>
       </template>
       <template #bottom="props">
diff --git a/src/modules/03_recruiting/components/Table.vue b/src/modules/03_recruiting/components/Table.vue
index 7e6da1e0a..bd08b044a 100644
--- a/src/modules/03_recruiting/components/Table.vue
+++ b/src/modules/03_recruiting/components/Table.vue
@@ -111,10 +111,10 @@
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="nornmalData == true" />
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium" v-html="col.label" />
         </q-th>
-        <q-th auto-width v-if="nornmalData == true" />
       </q-tr>
     </template>
     <template #body="props">
diff --git a/src/modules/03_recruiting/components/Table1.vue b/src/modules/03_recruiting/components/Table1.vue
index a7f67f171..d9a8175b9 100644
--- a/src/modules/03_recruiting/components/Table1.vue
+++ b/src/modules/03_recruiting/components/Table1.vue
@@ -72,10 +72,10 @@
       <q-tr :props="props">
         <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
         <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
+        <q-th auto-width v-if="iconLeft == true" />
         <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 v-if="name !== 'การลา'" />
         <q-th auto-width v-if="name === 'ประวัติการเปลี่ยนชื่อ-นามสกุล'" />
       </q-tr>
     </template>
@@ -115,6 +115,9 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
+  iconLeft: {
+    type: Boolean,
+  },
   edit: {
     type: Function,
     default: () => console.log("not function"),
diff --git a/src/modules/03_recruiting/components/TableCan.vue b/src/modules/03_recruiting/components/TableCan.vue
index 9bf9e5ac2..4925e309c 100644
--- a/src/modules/03_recruiting/components/TableCan.vue
+++ b/src/modules/03_recruiting/components/TableCan.vue
@@ -68,10 +68,11 @@
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="boss == true" />
         <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 v-if="boss == true" />
+
       </q-tr>
     </template>
     <template #body="props">
@@ -97,6 +98,7 @@ const initialPagination = ref<Pagination>({
 
 const props = defineProps({
   inputfilter: String,
+  iconLeft: Boolean,
   name: String,
   icon: String,
   inputvisible: Array,
diff --git a/src/modules/03_recruiting/interface/request/Period.ts b/src/modules/03_recruiting/interface/request/Period.ts
index c63335412..8a2bb961f 100644
--- a/src/modules/03_recruiting/interface/request/Period.ts
+++ b/src/modules/03_recruiting/interface/request/Period.ts
@@ -71,6 +71,7 @@ interface RequestPosition {
   positionName: string;
   positionLevelId: string;
   positionLevelName: string;
+  code?: string;
   typeId: string;
   typeName: string;
   highDegree: Boolean;
diff --git a/src/modules/03_recruiting/interface/response/Period.ts b/src/modules/03_recruiting/interface/response/Period.ts
index 4dadf2056..ce76476f0 100644
--- a/src/modules/03_recruiting/interface/response/Period.ts
+++ b/src/modules/03_recruiting/interface/response/Period.ts
@@ -42,6 +42,7 @@ interface ResponsePeriodExam {
 }
 interface ResponsePosition {
   id: string;
+  code?: string;
   position: {
     id: string;
     name: string;
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index dbc55df1d..bbe88039b 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -21,12 +21,49 @@
       >
         <template #columns="props">
           <q-tr :props="props" class="cursor-pointer">
+            <q-td>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="primary"
+                @click="clickEditPeriod(props.row.id)"
+                icon="mdi-pencil-outline"
+              >
+                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+              </q-btn>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="red"
+                @click="clickDelete(props.row.id)"
+                icon="mdi-delete"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+
+              <q-btn
+                color="info"
+                flat
+                dense
+                round
+                size="12px"
+                icon="mdi-history"
+                @click="clickHistory(props.row.id)"
+              >
+                <q-tooltip>แสดงประวัติการทำงาน</q-tooltip>
+              </q-btn>
+            </q-td>
             <q-td
               v-for="col in props.cols"
               :key="col.name"
               :props="props"
               @click="clickDetail(props.row.id)"
             >
+            
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}
               </div>
@@ -122,42 +159,7 @@
                 {{ col.value }}
               </div>
             </q-td>
-            <q-td>
-              <q-btn
-                dense
-                size="12px"
-                flat
-                round
-                color="primary"
-                @click="clickEditPeriod(props.row.id)"
-                icon="mdi-pencil-outline"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                dense
-                size="12px"
-                flat
-                round
-                color="red"
-                @click="clickDelete(props.row.id)"
-                icon="mdi-delete"
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
 
-              <q-btn
-                color="info"
-                flat
-                dense
-                round
-                size="12px"
-                icon="mdi-history"
-                @click="clickHistory(props.row.id)"
-              >
-                <q-tooltip>แสดงประวัติการทำงาน</q-tooltip>
-              </q-btn>
-            </q-td>
           </q-tr>
         </template>
       </Table>
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index a0f339bb5..3efd56018 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -21,6 +21,42 @@
       >
         <template #columns="props">
           <q-tr :props="props" class="cursor-pointer">
+            <q-td>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="primary"
+                @click="clickEditPeriod(props.row.id)"
+                icon="mdi-pencil-outline"
+              >
+                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+              </q-btn>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="red"
+                @click="clickDelete(props.row.id)"
+                icon="mdi-delete"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+
+              <q-btn
+                color="info"
+                flat
+                dense
+                round
+                size="12px"
+                icon="mdi-history"
+                @click="clickHistory(props.row.id)"
+              >
+                <q-tooltip>แสดงประวัติการทำงาน</q-tooltip>
+              </q-btn>
+            </q-td>
             <q-td
               v-for="col in props.cols"
               :key="col.name"
@@ -122,42 +158,7 @@
                 {{ col.value }}
               </div>
             </q-td>
-            <q-td>
-              <q-btn
-                dense
-                size="12px"
-                flat
-                round
-                color="primary"
-                @click="clickEditPeriod(props.row.id)"
-                icon="mdi-pencil-outline"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                dense
-                size="12px"
-                flat
-                round
-                color="red"
-                @click="clickDelete(props.row.id)"
-                icon="mdi-delete"
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
 
-              <q-btn
-                color="info"
-                flat
-                dense
-                round
-                size="12px"
-                icon="mdi-history"
-                @click="clickHistory(props.row.id)"
-              >
-                <q-tooltip>แสดงประวัติการทำงาน</q-tooltip>
-              </q-btn>
-            </q-td>
           </q-tr>
         </template>
       </Table>
diff --git a/src/modules/03_recruiting/views/02_qualify/Period.vue b/src/modules/03_recruiting/views/02_qualify/Period.vue
index 13b775da5..992775b83 100644
--- a/src/modules/03_recruiting/views/02_qualify/Period.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Period.vue
@@ -21,6 +21,19 @@
       >
         <template #columns="props">
           <q-tr :props="props" class="cursor-pointer">
+            <q-td>
+              <q-btn
+                dense
+                size="12px"
+                flat
+                round
+                color="red"
+                @click="clickDelete(props.row.id)"
+                icon="mdi-delete"
+              >
+                <q-tooltip>ลบข้อมูล</q-tooltip>
+              </q-btn>
+            </q-td>
             <q-td
               v-for="col in props.cols"
               :key="col.name"
@@ -56,19 +69,7 @@
                 {{ col.value }}
               </div>
             </q-td>
-            <q-td>
-              <q-btn
-                dense
-                size="12px"
-                flat
-                round
-                color="red"
-                @click="clickDelete(props.row.id)"
-                icon="mdi-delete"
-              >
-                <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
-            </q-td>
+
           </q-tr>
         </template>
       </Table>
@@ -220,6 +221,7 @@ const fetchData = async () => {
     .get(config.API.periodExamType("all"))
     .then((res) => {
       const data = res.data.result;
+      console.log("🚀 ~ .then ~ data:", data)
       let result: ResponsePeriodExam[] = [];
       if (data.length > 0) {
         data.map((r: RequestPeriodExam) => {
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index c1bf691a9..693aea773 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -368,9 +368,21 @@
                 icon=""
                 :statusEdit="false"
                 :headerShow="false"
+                :icon-left="true"
               >
                 <template #columns="props">
                   <q-tr :props="props">
+                    <q-td auto-width>
+                      <q-btn
+                        color="red"
+                        flat
+                        dense
+                        round
+                        size="14px"
+                        icon="mdi-delete"
+                        @click="clickDeletePosition(props.row)"
+                      />
+                    </q-td>
                     <q-td key="code" :props="props">
                       <q-input
                         outlined
@@ -490,17 +502,7 @@
                         :rules="[(val:any) => !!val || `${'กรุณาเลือกประเภทแบบฟอร์ม'}`]"
                       ></selector>
                     </q-td>
-                    <q-td auto-width>
-                      <q-btn
-                        color="red"
-                        flat
-                        dense
-                        round
-                        size="14px"
-                        icon="mdi-delete"
-                        @click="clickDeletePosition(props.row)"
-                      />
-                    </q-td>
+
                   </q-tr>
                 </template>
               </ProfileTable>
diff --git a/src/modules/04_registry/interface/index/Main.ts b/src/modules/04_registry/interface/index/Main.ts
index 4405392c3..98727351c 100644
--- a/src/modules/04_registry/interface/index/Main.ts
+++ b/src/modules/04_registry/interface/index/Main.ts
@@ -1,6 +1,6 @@
 import type { zipCodeOption } from "../../components/profileType";
 interface Pagination {
-  page: number;
+  page?: number;
   rowsPerPage: number;
 }
 
diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index bf18daa96..8898dde42 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -433,19 +433,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" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -491,6 +486,12 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index a119beb0e..cfbd457a4 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -591,19 +591,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" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -636,6 +631,12 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index 6d52cc1dc..bd0ba051b 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -705,25 +705,15 @@ 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" v-if="modeView === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td
-          v-for="col in props.cols"
-          class="cursor-pointer"
-          :key="col.name"
-          :props="props"
-        >
-          <div class="table_ellipsis">
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             flat
@@ -749,6 +739,17 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td
+          v-for="col in props.cols"
+          class="cursor-pointer"
+          :key="col.name"
+          :props="props"
+        >
+          <div class="table_ellipsis">
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
 
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index 6303e54d3..4d05de6e1 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -435,25 +435,15 @@ 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" v-if="modeView === 'table'">
       <q-tr :props="props">
-        <q-td
-          v-for="col in props.cols"
-          :key="col.name"
-          :props="props"
-          class="cursor-pointer"
-        >
-          <div class="table_ellipsis">
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             flat
@@ -479,6 +469,17 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+          class="cursor-pointer"
+        >
+          <div class="table_ellipsis">
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
 
diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
index 2be1c6b2e..bf4c5e419 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -507,25 +507,15 @@ 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" v-if="modeView === 'table'">
       <q-tr :props="props">
-        <q-td
-          v-for="col in props.cols"
-          :key="col.name"
-          :props="props"
-          class="cursor-pointer"
-        >
-          <div class="table_ellipsis">
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             flat
@@ -551,6 +541,17 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+          class="cursor-pointer"
+        >
+          <div class="table_ellipsis">
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
 
diff --git a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue b/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
index 4f06326be..3b7f04398 100644
--- a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue
@@ -288,21 +288,17 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
+          <q-th auto-width></q-th>
+          <q-th auto-width></q-th>
           <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-th>
-          <q-th auto-width></q-th>
-          <q-th auto-width></q-th>
+
         </q-tr>
       </template>
       <template v-slot:body="props">
         <q-tr :props="props" class="cursor-pointer" style="height: 40px">
-          <q-td v-for="col in props.cols" :key="col.name" :props="props">
-            <div>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
           <q-td>
             <q-btn
               dense
@@ -339,6 +335,12 @@ onMounted(() => {
               <q-tooltip>ประวัติข้อมูลการจ้าง </q-tooltip>
             </q-btn>
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div>
+              {{ col.value ? col.value : "-" }}
+            </div>
+          </q-td>
+
         </q-tr>
       </template>
     </d-table>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index b106ae4aa..06f6b64da 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -439,24 +439,14 @@ onMounted(async () => {
     >
     <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" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width></q-th>
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div v-if="col.name === 'no'">
-            {{
-              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
-            }}
-          </div>
-          <div v-else>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -496,6 +486,17 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div v-if="col.name === 'no'">
+            {{
+              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+            }}
+          </div>
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
index d860bfc4d..9e5f41846 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -550,32 +550,14 @@ 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" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width></q-th>
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div v-if="col.name === 'no'">
-            {{
-              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
-            }}
-          </div>
-          <div v-else-if="col.name == 'dateLeave'">
-            {{
-              dateThaiRange([props.row.dateStartLeave, props.row.dateEndLeave])
-            }}
-          </div>
-          <div v-else-if="col.name == 'status'">
-            {{ statusLeave(col.value) }}
-          </div>
-          <div v-else>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -602,6 +584,25 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div v-if="col.name === 'no'">
+            {{
+              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+            }}
+          </div>
+          <div v-else-if="col.name == 'dateLeave'">
+            {{
+              dateThaiRange([props.row.dateStartLeave, props.row.dateEndLeave])
+            }}
+          </div>
+          <div v-else-if="col.name == 'status'">
+            {{ statusLeave(col.value) }}
+          </div>
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index 83d9f3b07..bd707ceb9 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -395,25 +395,14 @@ onMounted(async () => {
     >
     <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" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width></q-th>
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div v-if="col.name === 'no'">
-            {{
-              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
-            }}
-          </div>
-
-          <div v-else>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -453,6 +442,18 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div v-if="col.name === 'no'">
+            {{
+              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+            }}
+          </div>
+
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
index e1462a0f2..6297607ff 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
@@ -306,19 +306,14 @@ 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" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width></q-th>
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             flat
@@ -344,6 +339,12 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 47d23f350..7e8e13408 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -628,20 +628,15 @@ watch(
   >
     <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, index) in props.cols" :key="col.name">
-          <div class="table_ellipsis">
-            {{ col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="green"
@@ -698,6 +693,11 @@ watch(
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="(col, index) in props.cols" :key="col.name">
+          <div class="table_ellipsis">
+            {{ col.value }}
+          </div>
+        </q-td>
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 9ce44132b..b67b5441e 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -792,19 +792,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" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value === "" || col.value === null ? "-" : col.value }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -850,6 +845,12 @@ onMounted(async () => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value === "" || col.value === null ? "-" : col.value }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
index 2b5a6c600..b262f6048 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -400,17 +400,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" v-if="mode === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>{{ col.value ? col.value : "-" }}</div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -444,6 +441,10 @@ onMounted(async () => {
             <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>{{ col.value ? col.value : "-" }}</div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
index c582f2e84..4f11808d0 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -599,12 +599,12 @@ onMounted(() => {
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width />
         <q-th auto-width />
         <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">
@@ -637,11 +637,6 @@ onMounted(() => {
             <!-- <q-tooltip>เลื่อนลำดับลง</q-tooltip> -->
           </q-btn>
         </q-td>
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div class="table_ellipsis">
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="primary"
@@ -668,6 +663,12 @@ onMounted(() => {
             <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div class="table_ellipsis">
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+
       </q-tr>
     </template>
   </d-table>
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
index 2765dd722..3c4af79f2 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -327,17 +327,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-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width />
       </q-tr>
     </template>
     <template v-slot:body="props" v-if="modelView === 'table'">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>{{ col.value ? col.value : "-" }}</div>
-        </q-td>
         <q-td auto-width>
           <q-btn
             flat
@@ -376,6 +373,9 @@ onMounted(() => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>{{ col.value ? col.value : "-" }}</div>
+        </q-td>
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue
index 3605b07b7..fdcf520a6 100644
--- a/src/modules/05_placement/components/AppointMent/Main.vue
+++ b/src/modules/05_placement/components/AppointMent/Main.vue
@@ -394,74 +394,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-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="
@@ -559,6 +499,67 @@ onMounted(() => {
                     </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/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index 9af971be0..bc8cea639 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -297,14 +297,33 @@ 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">
               <q-tr :props="props" class="cursor-pointer">
+                <q-td auto-width>
+                  <q-btn
+                    :color="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                        ? 'grey'
+                        : 'red-7'
+                    "
+                    :disable="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                    "
+                    flat
+                    round
+                    class="text-red-14"
+                    icon="mdi-delete"
+                    dense
+                    @click.stop="clickDelete(props.row.id)"
+                    ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
+                  >
+                </q-td>
                 <q-td
                   v-for="col in props.cols"
                   :key="col.id"
@@ -327,25 +346,7 @@ onMounted(() => {
                   </div>
                 </q-td>
 
-                <q-td auto-width>
-                  <q-btn
-                    :color="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                        ? 'grey'
-                        : 'red-7'
-                    "
-                    :disable="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                    "
-                    flat
-                    round
-                    class="text-red-14"
-                    icon="mdi-delete"
-                    dense
-                    @click.stop="clickDelete(props.row.id)"
-                    ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
-                  >
-                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 2590b3a97..d04b27c12 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -786,112 +786,6 @@ onMounted(async () => {
     >
       <template #columns="props">
         <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props.row.personalId, props.row.draft)"
-            class="cursor-pointer"
-          >
-            <template v-if="col.name === 'no'">
-              {{ props.rowIndex + 1 }}
-            </template>
-            <template
-              v-else-if="col.name === 'fullName'"
-              class="table_ellipsis"
-            >
-              <q-item v-ripple>
-                <q-item-section avatar>
-                  <q-avatar size="30px" color="grey-4">
-                    <q-img :src="props.row.avatar" class="photo-profile" />
-                  </q-avatar>
-                </q-item-section>
-
-                <q-item-section>
-                  <div class="text-weight-medium">{{ props.row.name }}</div>
-                  <div class="text-weight-light">{{ props.row.idCard }}</div>
-                </q-item-section>
-              </q-item>
-            </template>
-            <template v-else-if="col.name === 'examNumber'">
-              <div class="text-weight-medium">
-                {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'organizationName'">
-              <div
-                v-if="
-                  props.row.orgName !== null || props.row.positionPath !== null
-                "
-              >
-                <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>
-                <div class="col-4">
-                  <div class="text-weight-medium">-</div>
-                </div>
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'positionCandidate'">
-              <div
-                class="text-weight-medium"
-                v-if="props.row.positionCandidate == null"
-              >
-                -
-              </div>
-              <div class="text-weight-medium" v-else>
-                {{ props.row.positionCandidate }}
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'reportingDate'">
-              <div class="text-weight-medium">
-                {{
-                  props.row.reportingDate !== null
-                    ? dateText(props.row.reportingDate)
-                    : "-"
-                }}
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'bmaOfficer'">
-              <div class="text-weight-medium">
-                {{ props.row.bmaOfficer }}
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'draft'">
-              <div class="text-weight-medium">
-                {{ props.row.draft }}
-              </div>
-            </template>
-
-            <template v-else-if="col.name === 'statusName'">
-              <div class="text-weight-medium">
-                {{ props.row.statusName }}
-              </div>
-            </template>
-          </q-td>
           <q-td auto-width>
             <q-btn
               v-if="props.row.statusId !== 'CONTAIN'"
@@ -1163,6 +1057,113 @@ onMounted(async () => {
               </q-menu>
             </q-btn>
           </q-td>
+          <q-td
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+            @click="selectData(props.row.personalId, props.row.draft)"
+            class="cursor-pointer"
+          >
+            <template v-if="col.name === 'no'">
+              {{ props.rowIndex + 1 }}
+            </template>
+            <template
+              v-else-if="col.name === 'fullName'"
+              class="table_ellipsis"
+            >
+              <q-item v-ripple>
+                <q-item-section avatar>
+                  <q-avatar size="30px" color="grey-4">
+                    <q-img :src="props.row.avatar" class="photo-profile" />
+                  </q-avatar>
+                </q-item-section>
+
+                <q-item-section>
+                  <div class="text-weight-medium">{{ props.row.name }}</div>
+                  <div class="text-weight-light">{{ props.row.idCard }}</div>
+                </q-item-section>
+              </q-item>
+            </template>
+            <template v-else-if="col.name === 'examNumber'">
+              <div class="text-weight-medium">
+                {{ props.row.examNumber !== null ? props.row.examNumber : "-" }}
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'organizationName'">
+              <div
+                v-if="
+                  props.row.orgName !== null || props.row.positionPath !== null
+                "
+              >
+                <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>
+                <div class="col-4">
+                  <div class="text-weight-medium">-</div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'positionCandidate'">
+              <div
+                class="text-weight-medium"
+                v-if="props.row.positionCandidate == null"
+              >
+                -
+              </div>
+              <div class="text-weight-medium" v-else>
+                {{ props.row.positionCandidate }}
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'reportingDate'">
+              <div class="text-weight-medium">
+                {{
+                  props.row.reportingDate !== null
+                    ? dateText(props.row.reportingDate)
+                    : "-"
+                }}
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'bmaOfficer'">
+              <div class="text-weight-medium">
+                {{ props.row.bmaOfficer }}
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'draft'">
+              <div class="text-weight-medium">
+                {{ props.row.draft }}
+              </div>
+            </template>
+
+            <template v-else-if="col.name === 'statusName'">
+              <div class="text-weight-medium">
+                {{ props.row.statusName }}
+              </div>
+            </template>
+          </q-td>
+
         </q-tr>
       </template>
     </Table>
diff --git a/src/modules/05_placement/components/PersonalList/TableView.vue b/src/modules/05_placement/components/PersonalList/TableView.vue
index ee0730c42..8ff0625de 100644
--- a/src/modules/05_placement/components/PersonalList/TableView.vue
+++ b/src/modules/05_placement/components/PersonalList/TableView.vue
@@ -246,10 +246,10 @@ function updateModaladdlist() {
       </template>
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width v-if="history == true" />
           <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 v-if="history == true" />
         </q-tr>
       </template>
       <template #body="props">
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 908decb9b..482fb9f68 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -425,73 +425,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-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 == 'dateOfBirth'">
-                    {{
-                      props.row.dateOfBirth
-                        ? date2Thai(props.row.dateOfBirth)
-                        : "-"
-                    }}
-                  </div>
-                  <div v-else-if="col.name == 'createdAt'">
-                    {{
-                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
-                    }}
-                  </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 == '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="
@@ -594,6 +535,66 @@ onMounted(() => {
                     </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 == 'dateOfBirth'">
+                    {{
+                      props.row.dateOfBirth
+                        ? date2Thai(props.row.dateOfBirth)
+                        : "-"
+                    }}
+                  </div>
+                  <div v-else-if="col.name == 'createdAt'">
+                    {{
+                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
+                    }}
+                  </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 == 'status'">
+                    {{ props.row.status ? statusText(props.row.status) : "-" }}
+                  </div>
+                  <div v-else>
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+
               </q-tr>
               <!-- <q-tr :props="props" class="cursor-pointer">
                 <q-td
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
index cbcdbd1e0..471ffea05 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
@@ -283,15 +283,35 @@ 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 auto-width>
+                  <q-btn
+                    icon="delete"
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    :color="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                        ? 'grey'
+                        : 'red-7'
+                    "
+                    @click="clickDelete(props.row.fullname, props.row.id)"
+                    :disable="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                    "
+                  >
+                    <q-tooltip>ลบข้อมูล</q-tooltip>
+                  </q-btn>
+                </q-td>
                 <q-td
                   v-for="col in props.cols"
                   :key="col.id"
@@ -313,26 +333,7 @@ onMounted(async () => {
                     {{ col.value == null ? "" : col.value }}
                   </div>
                 </q-td>
-                <q-td auto-width>
-                  <q-btn
-                    icon="delete"
-                    size="14px"
-                    flat
-                    round
-                    dense
-                    :color="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                        ? 'grey'
-                        : 'red-7'
-                    "
-                    @click="clickDelete(props.row.fullname, props.row.id)"
-                    :disable="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                    "
-                  >
-                    <q-tooltip>ลบข้อมูล</q-tooltip>
-                  </q-btn>
-                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
index d7ee6b237..46fd647b7 100644
--- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue
+++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
@@ -306,14 +306,34 @@ 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 auto-width>
+                  <q-btn
+                    icon="delete"
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    :color="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                        ? 'grey'
+                        : 'red-7'
+                    "
+                    @click="clickDelete(props.row.id)"
+                    :disable="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                    "
+                  >
+                    <q-tooltip>ลบข้อมูล</q-tooltip>
+                  </q-btn>
+                </q-td>
                 <q-td
                   v-for="col in props.cols"
                   :key="col.id"
@@ -337,26 +357,7 @@ onMounted(async () => {
                     }}
                   </div>
                 </q-td>
-                <q-td auto-width>
-                  <q-btn
-                    icon="delete"
-                    size="14px"
-                    flat
-                    round
-                    dense
-                    :color="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                        ? 'grey'
-                        : 'red-7'
-                    "
-                    @click="clickDelete(props.row.id)"
-                    :disable="
-                      props.row.status == 'REPORT' || props.row.status == 'DONE'
-                    "
-                  >
-                    <q-tooltip>ลบข้อมูล</q-tooltip>
-                  </q-btn>
-                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
index cea4b5420..a49555192 100644
--- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
@@ -268,31 +268,14 @@ const pagination = ref({
           >
             <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="router.push(`/retirement/out/${props.row.id}`)"
-                >
-                  <div v-if="col.name === 'no'">
-                    {{ props.rowIndex + 1 }}
-                  </div>
-
-                  <div
-                    v-else
-                    :class="col.name === 'organizationPositionOld' ? 'table_ellipsis' : ''"
-                  >
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
-
                 <q-td auto-width>
                   <q-btn
                     dense
@@ -313,6 +296,24 @@ const pagination = ref({
                     <q-tooltip>ลบข้อมูล</q-tooltip>
                   </q-btn>
                 </q-td>
+                <q-td
+                  v-for="col in props.cols"
+                  :key="col.id"
+                  @click="router.push(`/retirement/out/${props.row.id}`)"
+                >
+                  <div v-if="col.name === 'no'">
+                    {{ props.rowIndex + 1 }}
+                  </div>
+
+                  <div
+                    v-else
+                    :class="col.name === 'organizationPositionOld' ? 'table_ellipsis' : ''"
+                  >
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
index fcd46d25d..bdd989a1a 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@@ -348,14 +348,28 @@ const openModalCalendar = (rows: 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 auto-width>
+                  <q-btn
+                    v-if="!props.row.appointDate"
+                    icon="mdi-calendar"
+                    size="12px"
+                    color="blue-7"
+                    flat
+                    round
+                    dense
+                    @click="openModalCalendar(props.row)"
+                  >
+                    <q-tooltip>วันนัดหมายเพื่อทําการสัมภาษณ์การลาออก</q-tooltip>
+                  </q-btn>
+                </q-td>
                 <q-td
                   key="no"
                   :props="props"
@@ -451,20 +465,7 @@ const openModalCalendar = (rows: any) => {
                 >
                   {{ props.row.datetext }}
                 </q-td>
-                <q-td auto-width>
-                  <q-btn
-                    v-if="!props.row.appointDate"
-                    icon="mdi-calendar"
-                    size="12px"
-                    color="blue-7"
-                    flat
-                    round
-                    dense
-                    @click="openModalCalendar(props.row)"
-                  >
-                    <q-tooltip>วันนัดหมายเพื่อทําการสัมภาษณ์การลาออก</q-tooltip>
-                  </q-btn>
-                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
index 0a46978a6..0e60229a8 100644
--- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue
@@ -284,25 +284,17 @@ onMounted(async () => {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
+              <q-th auto-width />
+              <q-th auto-width />
+              <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-th auto-width />
-              <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="clickEdit(props.row)"
-              >
-                <div>
-                  {{ col.value }}
-                </div>
-              </q-td>
               <q-td
                 key="period_isActive"
                 :props="props"
@@ -365,6 +357,16 @@ onMounted(async () => {
                   <q-tooltip>ลบข้อมูล</q-tooltip>
                 </q-btn>
               </q-td>
+              <q-td
+                v-for="col in props.cols"
+                :key="col.id"
+                @click="clickEdit(props.row)"
+              >
+                <div>
+                  {{ col.value }}
+                </div>
+              </q-td>
+
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 9cff5b3e1..4eb60c01a 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -59,6 +59,8 @@ const filterOrganizationOP = ref<any>([]);
 
 /** หัวตาราง*/
 const visibleColumns = ref<string[]>([
+  "note",
+  "warn",
   "no",
   "citizenId",
   "name",
@@ -70,10 +72,26 @@ const visibleColumns = ref<string[]>([
   "insigniaSend",
   "insigniaLevel",
   "dateSend",
-  "note",
-  "warn",
 ]);
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "note",
+    align: "left",
+    label: "หมายเหตุ",
+    sortable: false,
+    field: "",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "warn",
+    align: "left",
+    label: "แจ้งเตือน",
+    sortable: false,
+    field: "",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "no",
     align: "left",
@@ -173,24 +191,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "note",
-    align: "left",
-    label: "หมายเหตุ",
-    sortable: true,
-    field: "",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "warn",
-    align: "left",
-    label: "แจ้งเตือน",
-    sortable: true,
-    field: "",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -1043,10 +1043,6 @@ onMounted(async () => {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
-              <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></q-th>
               <q-th
                 auto-width
                 v-if="
@@ -1055,7 +1051,10 @@ onMounted(async () => {
                   checkStatus == true
                 "
               />
-              <q-th v-else></q-th>
+              <q-th auto-width></q-th>
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
             </q-tr>
           </template>
           <template v-slot:body="props">
@@ -1064,74 +1063,6 @@ onMounted(async () => {
               class="cursor-pointer"
               @click.stop="nextPage(props.row.profileId)"
             >
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="citizenId" :props="props">
-                {{ props.row.citizenId ?? "-" }}
-              </q-td>
-              <q-td key="name" :props="props">
-                {{ props.row.name }}
-              </q-td>
-              <q-td key="employeeType" :props="props">
-                {{ props.row.employeeType }}
-              </q-td>
-              <q-td key="position" :props="props">
-                {{ props.row.position }}
-              </q-td>
-              <q-td key="level" :props="props">
-                {{ props.row.level }}
-              </q-td>
-              <q-td key="salary" :props="props">
-                {{ Number(props.row.salary).toLocaleString() }}
-              </q-td>
-              <q-td key="insigniaType" :props="props">
-                {{ props.row.insigniaType }}
-              </q-td>
-              <q-td key="insigniaSend" :props="props">
-                {{ props.row.insigniaSend }}
-              </q-td>
-              <q-td key="insigniaLevel" :props="props">
-                {{ props.row.insigniaLevel }}
-              </q-td>
-              <q-td key="dateSend" :props="props">
-                {{ props.row.dateSend }}
-              </q-td>
-              <q-td key="note" class="text-center">
-                <q-btn
-                  v-if="props.row.reason"
-                  icon="mdi-information-outline"
-                  size="12px"
-                  color="blue"
-                  flat
-                  round
-                  dense
-                  @click.stop="clickShowreson(props.row.name, props.row.reason)"
-                >
-                  <q-tooltip>หมายเหตุ</q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td key="warn" class="text-center" v-if="props.row.statusMark">
-                <q-btn
-                  icon="mdi-information-outline"
-                  size="12px"
-                  color="red"
-                  flat
-                  round
-                  dense
-                  @click.stop="
-                    clickShowWarn(
-                      props.row.markDiscipline,
-                      props.row.markLeave,
-                      props.row.markRate
-                    )
-                  "
-                >
-                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
-                >
-              </q-td>
-              <q-td v-else auto-width></q-td>
-
               <q-td
                 v-close-popup
                 auto-width
@@ -1213,18 +1144,83 @@ onMounted(async () => {
                   </q-menu>
                 </q-btn>
               </q-td>
-              <q-td v-else auto-width></q-td>
-              <q-td
-                auto-width
-                v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
-              >
+
+              <q-td auto-width>
                 <btnDownloadFile
+                  v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
                   :profileId="props.row.profileId"
                   :round="DataStore.roundId"
                   :optionRound="DataStore.optionRound"
                 />
               </q-td>
-              <q-td v-else auto-width></q-td>
+
+              <q-td key="note" class="text-center">
+                <q-btn
+                  v-if="props.row.reason"
+                  icon="mdi-information-outline"
+                  size="12px"
+                  color="blue"
+                  flat
+                  round
+                  dense
+                  @click.stop="clickShowreson(props.row.name, props.row.reason)"
+                >
+                  <q-tooltip>หมายเหตุ</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td key="warn" class="text-center">
+                <q-btn
+                  v-if="props.row.statusMark"
+                  icon="mdi-information-outline"
+                  size="12px"
+                  color="red"
+                  flat
+                  round
+                  dense
+                  @click.stop="
+                    clickShowWarn(
+                      props.row.markDiscipline,
+                      props.row.markLeave,
+                      props.row.markRate
+                    )
+                  "
+                >
+                  <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
+                >
+              </q-td>
+              <q-td key="no" :props="props">
+                {{ props.rowIndex + 1 }}
+              </q-td>
+              <q-td key="citizenId" :props="props">
+                {{ props.row.citizenId ?? "-" }}
+              </q-td>
+              <q-td key="name" :props="props">
+                {{ props.row.name }}
+              </q-td>
+              <q-td key="employeeType" :props="props">
+                {{ props.row.employeeType }}
+              </q-td>
+              <q-td key="position" :props="props">
+                {{ props.row.position }}
+              </q-td>
+              <q-td key="level" :props="props">
+                {{ props.row.level }}
+              </q-td>
+              <q-td key="salary" :props="props">
+                {{ Number(props.row.salary).toLocaleString() }}
+              </q-td>
+              <q-td key="insigniaType" :props="props">
+                {{ props.row.insigniaType }}
+              </q-td>
+              <q-td key="insigniaSend" :props="props">
+                {{ props.row.insigniaSend }}
+              </q-td>
+              <q-td key="insigniaLevel" :props="props">
+                {{ props.row.insigniaLevel }}
+              </q-td>
+              <q-td key="dateSend" :props="props">
+                {{ props.row.dateSend }}
+              </q-td>
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue
index a569f2039..86e72cc38 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab2.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue
@@ -352,7 +352,7 @@ onMounted(async () => {
             :borderless="false"
             :outlined="true"
             :hide-dropdown-icon="false"
-             style="min-width: 320px"
+            style="min-width: 320px"
             @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
@@ -446,10 +446,10 @@ 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">
@@ -458,6 +458,20 @@ onMounted(async () => {
               class="cursor-pointer"
               @click="nextPage(props.row.profileId)"
             >
+              <q-td v-if="props.row.requestNote != null" auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="blue"
+                  @click.stop
+                  @click="showReson(props.row.name, props.row.requestNote)"
+                  icon="mdi-information-outline"
+                >
+                  <q-tooltip>เหตุผลการไม่ยื่นขอ</q-tooltip>
+                </q-btn>
+              </q-td>
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -488,20 +502,6 @@ onMounted(async () => {
               <q-td key="insigniaLevel" :props="props">
                 {{ props.row.insigniaLevel }}
               </q-td>
-              <q-td v-if="props.row.requestNote != null" auto-width>
-                <q-btn
-                  dense
-                  size="12px"
-                  flat
-                  round
-                  color="blue"
-                  @click.stop
-                  @click="showReson(props.row.name, props.row.requestNote)"
-                  icon="mdi-information-outline"
-                >
-                  <q-tooltip>เหตุผลการไม่ยื่นขอ</q-tooltip>
-                </q-btn>
-              </q-td>
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue
index 3262f3107..d43629baf 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab3.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue
@@ -351,7 +351,7 @@ onMounted(async () => {
             :borderless="false"
             :outlined="true"
             :hide-dropdown-icon="false"
-           style="min-width: 320px"
+            style="min-width: 320px"
             @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
@@ -445,10 +445,10 @@ 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">
@@ -457,6 +457,19 @@ onMounted(async () => {
               class="cursor-pointer"
               @click="nextPage(props.row.profileId)"
             >
+              <q-td v-if="props.row.requestNote != null" auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="blue"
+                  @click.stop="showNote(props.row)"
+                  icon="mdi-information-outline"
+                >
+                  <q-tooltip>เหตุผลการลบออก</q-tooltip>
+                </q-btn>
+              </q-td>
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -488,19 +501,6 @@ onMounted(async () => {
               <q-td key="insigniaLevel" :props="props">
                 {{ props.row.insigniaLevel }}
               </q-td>
-              <q-td v-if="props.row.requestNote != null" auto-width>
-                <q-btn
-                  dense
-                  size="12px"
-                  flat
-                  round
-                  color="blue"
-                  @click.stop="showNote(props.row)"
-                  icon="mdi-information-outline"
-                >
-                  <q-tooltip>เหตุผลการลบออก</q-tooltip>
-                </q-btn>
-              </q-td>
             </q-tr>
           </template>
         </d-table>
diff --git a/src/modules/07_insignia/components/4_Allocate/Main.vue b/src/modules/07_insignia/components/4_Allocate/Main.vue
index c2a8951d1..e706d45c9 100644
--- a/src/modules/07_insignia/components/4_Allocate/Main.vue
+++ b/src/modules/07_insignia/components/4_Allocate/Main.vue
@@ -541,56 +541,15 @@ 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
-                  key="no"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.rowIndex + 1 }}
-                </q-td>
-                <q-td
-                  key="year"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.row.year }}
-                </q-td>
-                <q-td
-                  key="insignia"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.row.insignia }}
-                </q-td>
-                <q-td
-                  key="total"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.row.total }}
-                </q-td>
-                <q-td
-                  key="allocate"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.row.allocate }}
-                </q-td>
-                <q-td
-                  key="remain"
-                  :props="props"
-                  @click="redirectToPage(props.row.id, props.row.insignia)"
-                >
-                  {{ props.row.remain }}
-                </q-td>
                 <q-td auto-width>
                   <q-btn
                     icon="mdi-dots-vertical"
@@ -640,6 +599,49 @@ onMounted(async () => {
                     </q-menu>
                   </q-btn>
                 </q-td>
+                <q-td
+                  key="no"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.rowIndex + 1 }}
+                </q-td>
+                <q-td
+                  key="year"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.row.year }}
+                </q-td>
+                <q-td
+                  key="insignia"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.row.insignia }}
+                </q-td>
+                <q-td
+                  key="total"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.row.total }}
+                </q-td>
+                <q-td
+                  key="allocate"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.row.allocate }}
+                </q-td>
+                <q-td
+                  key="remain"
+                  :props="props"
+                  @click="redirectToPage(props.row.id, props.row.insignia)"
+                >
+                  {{ props.row.remain }}
+                </q-td>
+
               </q-tr>
             </template>
           </d-table>
diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue
index 2396fdb23..f84506e52 100644
--- a/src/modules/07_insignia/components/5_Borrow/Main.vue
+++ b/src/modules/07_insignia/components/5_Borrow/Main.vue
@@ -23,6 +23,7 @@ const tab = ref<string>("");
 
 /** ข้อมูล Table*/
 const visibleColumns = ref<String[]>([
+  "action",
   "no",
   "status",
   "citizenId",
@@ -44,9 +45,15 @@ const visibleColumns = ref<String[]>([
   "returnOrganization",
   "returnDate",
   "returnReason",
-  "action",
+
 ]);
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "action",
+    align: "left",
+    label: "",
+    field: "",
+  },
   {
     name: "no",
     align: "left",
@@ -228,12 +235,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "action",
-    align: "left",
-    label: "",
-    field: "",
-  },
+
 ]);
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 2f78d5363..64f3ffe18 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -67,6 +67,12 @@ const dataModal = ref<any>([]);
  * ข้อมูล Tabla
  */
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "action",
+    align: "left",
+    label: "",
+    field: "",
+  },
   {
     name: "no",
     align: "left",
@@ -210,14 +216,10 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "action",
-    align: "left",
-    label: "",
-    field: "",
-  },
+
 ]);
 const visibleColumns = ref<String[]>([
+  "action",
   "no",
   "status",
   "citizenId",
@@ -234,7 +236,7 @@ const visibleColumns = ref<String[]>([
   "datepay",
   "typepay",
   "address",
-  "action",
+
 ]);
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 01587a27e..79827d1af 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -372,54 +372,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-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">
-              <template v-if="col.name === 'draftOrganizationOrganization'">
-                <div
-                  v-if="
-                    props.row.orgName !== null ||
-                    props.row.positionPath !== null
-                  "
-                >
-                  <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.posNo})`
-                          : ""
-                      }}
-                    </div>
-                  </div>
-                </div>
-
-                <div v-else>
-                  <div class="col-4">
-                    <div class="text-weight-medium">-</div>
-                  </div>
-                </div>
-              </template>
-              <div v-else>
-                {{ col.value !== null && col.value !== "" ? col.value : "-" }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 icon="mdi-dots-vertical"
@@ -489,6 +449,46 @@ onMounted(() => {
                 </q-menu>
               </q-btn>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <template v-if="col.name === 'draftOrganizationOrganization'">
+                <div
+                  v-if="
+                    props.row.orgName !== null ||
+                    props.row.positionPath !== null
+                  "
+                >
+                  <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.posNo})`
+                          : ""
+                      }}
+                    </div>
+                  </div>
+                </div>
+
+                <div v-else>
+                  <div class="col-4">
+                    <div class="text-weight-medium">-</div>
+                  </div>
+                </div>
+              </template>
+              <div v-else>
+                {{ col.value !== null && col.value !== "" ? col.value : "-" }}
+              </div>
+            </q-td>
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/09_leave/components/1_Work/TableList.vue b/src/modules/09_leave/components/1_Work/TableList.vue
index 6bf3cad48..8096f9634 100644
--- a/src/modules/09_leave/components/1_Work/TableList.vue
+++ b/src/modules/09_leave/components/1_Work/TableList.vue
@@ -132,14 +132,26 @@ onMounted(() => {
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="typeTab === 'time-record'"></q-th>
         <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 v-if="typeTab === 'time-record'"></q-th>
       </q-tr>
     </template>
     <template v-slot:body="props">
       <q-tr :props="props" class="cursor-pointer">
+        <q-td v-if="typeTab === 'time-record'">
+          <q-btn
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
+            @click.prevent="onClickEdit(props.row)"
+          >
+            <q-tooltip>แก้ไข</q-tooltip>
+          </q-btn>
+        </q-td>
         <q-td
           v-for="col in props.cols"
           :key="col.name"
@@ -177,18 +189,7 @@ onMounted(() => {
             {{ col.value }}
           </div>
         </q-td>
-        <q-td v-if="typeTab === 'time-record'">
-          <q-btn
-            flat
-            dense
-            round
-            color="edit"
-            icon="edit"
-            @click.prevent="onClickEdit(props.row)"
-          >
-            <q-tooltip>แก้ไข</q-tooltip>
-          </q-btn>
-        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/ChangeRoundMain.vue
index 26ff27127..0ba139ddf 100644
--- a/src/modules/09_leave/views/ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/ChangeRoundMain.vue
@@ -209,6 +209,7 @@ function searchData() {
         <!-- :paging="true" -->
         <template v-slot:header="props">
           <q-tr :props="props">
+            <q-th auto-width />
             <q-th
               v-for="col in props.cols"
               :key="col.name"
@@ -217,17 +218,11 @@ function searchData() {
             >
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
-            <q-th style="width: 200px" />
           </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>
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td style="width: 150px">
+            <q-td>
               <div>
                 <q-btn
                   flat
@@ -272,6 +267,11 @@ function searchData() {
                 </q-btn>
               </div>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div>
+                {{ col.value }}
+              </div>
+            </q-td>
           </q-tr>
         </template>
         <template v-slot:pagination="scope">
diff --git a/src/modules/09_leave/views/RoundMain.vue b/src/modules/09_leave/views/RoundMain.vue
index 332e44917..a0ee5783d 100644
--- a/src/modules/09_leave/views/RoundMain.vue
+++ b/src/modules/09_leave/views/RoundMain.vue
@@ -179,6 +179,7 @@ onMounted(() => {
       >
         <template v-slot:header="props">
           <q-tr :props="props">
+            <q-th auto-width></q-th>
             <q-th auto-width></q-th>
             <q-th
               v-for="col in props.cols"
@@ -188,12 +189,13 @@ 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 auto-width>
+              
               <q-icon
                 v-if="props.row.isDefault === true"
                 name="mdi-bookmark"
@@ -203,6 +205,16 @@ onMounted(() => {
                 <q-tooltip>เวลา Default</q-tooltip>
               </q-icon>
             </q-td>
+            <q-td>
+              <q-btn
+                dense
+                flat
+                round
+                color="red"
+                icon="delete"
+                @click="onClickDelete(props.row.id)"
+              />
+            </q-td>
             <q-td
               v-for="col in props.cols"
               :key="col.name"
@@ -227,16 +239,7 @@ onMounted(() => {
                 {{ col.value }}
               </div>
             </q-td>
-            <q-td>
-              <q-btn
-                dense
-                flat
-                round
-                color="red"
-                icon="delete"
-                @click="onClickDelete(props.row.id)"
-              />
-            </q-td>
+
           </q-tr>
         </template>
       </d-table>
diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/SpecialTimeMain.vue
index 82d4f69de..977e70213 100644
--- a/src/modules/09_leave/views/SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/SpecialTimeMain.vue
@@ -290,30 +290,15 @@ const monthYearThai = (val: any) => {
         </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" :props="props">
-              <div v-if="col.name == 'no'">
-                {{
-                  (dataSpecialTime.page - 1) * dataSpecialTime.pageSize +
-                  props.rowIndex +
-                  1
-                }}
-              </div>
-              <div v-else-if="col.name === 'description'" class="table_ellipsis">
-                {{ props.row.description }}
-              </div>
-              <div v-else>
-                {{ col.value }}
-              </div>
-            </q-td>
-            <q-td auto-width>
+            <q-td auto-width class="text-right">
               <q-btn
                 v-if="props.row.status == 'PENDING'"
                 color="orange"
@@ -356,6 +341,24 @@ const monthYearThai = (val: any) => {
                 label="ไม่อนุมัติ"
               />
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div v-if="col.name == 'no'">
+                {{
+                  (dataSpecialTime.page - 1) * dataSpecialTime.pageSize +
+                  props.rowIndex +
+                  1
+                }}
+              </div>
+              <div
+                v-else-if="col.name === 'description'"
+                class="table_ellipsis"
+              >
+                {{ props.row.description }}
+              </div>
+              <div v-else>
+                {{ col.value }}
+              </div>
+            </q-td>
           </q-tr>
         </template>
       </d-table>
@@ -369,7 +372,7 @@ const monthYearThai = (val: any) => {
     label="เหตุผล"
     :savaForm="clickSave"
   />
-  
+
   <DialogApprove
     :modal="modalApprove"
     :closeDialog="closeDialog"
diff --git a/src/modules/16_positionEmployee/components/DialogFormPosition.vue b/src/modules/16_positionEmployee/components/DialogFormPosition.vue
index d39b7c66a..2ce81f998 100644
--- a/src/modules/16_positionEmployee/components/DialogFormPosition.vue
+++ b/src/modules/16_positionEmployee/components/DialogFormPosition.vue
@@ -475,7 +475,6 @@ watch(
                               col.label
                             }}</span>
                           </q-th>
-                          <q-th auto-width></q-th>
                         </q-tr>
                       </template>
                       <template v-slot:body="props">
@@ -616,6 +615,7 @@ watch(
                     >
                       <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"
@@ -626,46 +626,10 @@ watch(
                               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 === 'posExecutiveName'">
-                              {{ col.value ? col.value : "-" }}
-                            </div>
-
-                            <div
-                              v-else-if="col.name === 'positionExecutiveField'"
-                            >
-                              {{ col.value ? col.value : "-" }}
-                            </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-if="col.name === 'positionArea'">
-                              {{ col.value ? col.value : "-" }}
-                            </div>
-                            <div v-else>
-                              {{ col.value }}
-                            </div>
-                          </q-td>
                           <q-td auto-width>
                             <q-btn
                               flat
@@ -706,6 +670,42 @@ watch(
                               </q-menu>
                             </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 === 'posExecutiveName'">
+                              {{ col.value ? col.value : "-" }}
+                            </div>
+
+                            <div
+                              v-else-if="col.name === 'positionExecutiveField'"
+                            >
+                              {{ col.value ? col.value : "-" }}
+                            </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-if="col.name === 'positionArea'">
+                              {{ col.value ? col.value : "-" }}
+                            </div>
+                            <div v-else>
+                              {{ col.value }}
+                            </div>
+                          </q-td>
+
                         </q-tr>
                       </template>
                     </d-table>
diff --git a/src/modules/16_positionEmployee/components/TreeTable.vue b/src/modules/16_positionEmployee/components/TreeTable.vue
index 210e1a91e..cffa6ac77 100644
--- a/src/modules/16_positionEmployee/components/TreeTable.vue
+++ b/src/modules/16_positionEmployee/components/TreeTable.vue
@@ -477,38 +477,14 @@ watch(
     >
       <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" :props="props">
             <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'">
-              {{
-                (reqMaster.page - 1) * Number(reqMaster.pageSize) +
-                props.rowIndex +
-                1
-              }}
-            </div>
-            <div v-else-if="col.name === 'posMasterNo'">
-              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
-            </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>
             <q-btn
               flat
@@ -602,6 +578,31 @@ watch(
               </q-menu>
             </q-btn>
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{
+                (reqMaster.page - 1) * Number(reqMaster.pageSize) +
+                props.rowIndex +
+                1
+              }}
+            </div>
+            <div v-else-if="col.name === 'posMasterNo'">
+              {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
+            </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>
       <template v-slot:pagination="scope">
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 72862c625..569c62cf9 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -466,6 +466,7 @@ onMounted(() => {
                       <q-tr :props="props">
                         <q-th auto-width v-if="rowListPerson.length !== 1" />
                         <q-th auto-width v-if="rowListPerson.length !== 1" />
+                        <q-th auto-width />
                         <q-th
                           v-for="col in props.cols"
                           :key="col.name"
@@ -475,7 +476,6 @@ onMounted(() => {
                             col.label
                           }}</span>
                         </q-th>
-                        <q-th auto-width />
                       </q-tr>
                     </template>
                     <template v-slot:body="props">
@@ -514,18 +514,6 @@ 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-td>
                           <q-btn
                             dense
@@ -539,6 +527,19 @@ 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>
                     <!-- <template v-slot:pagination="scope">