From 38a52c3ec6b52a56e28e3aa1cc1ae7fb54c7dc01 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Dec 2024 14:49:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A8=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../01_retirement/RetirementDetail.vue        | 25 ++++++++-----------
 .../components/02_resign/Table.vue            |  2 +-
 .../components/03_resignEmp/Table.vue         |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index ed676f086..b38844a24 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -168,11 +168,11 @@ async function fetchlistprofile(id: string) {
           prefix: e.prefix,
           firstName: e.firstName,
           lastName: e.lastName,
-          name: e.prefix + e.firstName + " " + e.lastName,
+          name: `${e.prefix}${e.firstName} ${e.lastName}`,
           organization: e.root,
           position: e.position,
           positionNumber: e.posNo,
-          positionType: e.posTypeName,
+          positionType: `${e.posTypeName} (${e.posLevelName})`,
           positionLevel: e.posLevelName,
           reason: e.reason,
           remove: e.remove,
@@ -663,7 +663,13 @@ onMounted(async () => {
                   ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
                 >
               </q-td>
-              <q-td key="order" :props="props">{{ props.row.order }} </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 key="order" :props="props">{{ props.row.order }} </q-td>
               <q-td key="name" :props="props"
                 >{{ props.row.prefix ? props.row.prefix : ""
                 }}{{ props.row.firstName ? props.row.firstName : "" }}
@@ -688,20 +694,9 @@ onMounted(async () => {
 
               <q-td class="table_ellipsis" key="organization" :props="props">{{
                 props.row.organization ? props.row.organization : "-"
-              }}</q-td>
+              }}</q-td> -->
             </q-tr>
           </template>
-          <!-- <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
-          </template> -->
         </d-table>
       </div>
     </q-card>
diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue
index ec911e81d..c050970f9 100644
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@@ -377,7 +377,7 @@ onMounted(async () => {
                       : ''
                   "
                 >
-                  {{ col.value ? col.value : "" }}
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
             </q-tr>
diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue
index 5a3e7f973..1c73be261 100644
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@@ -381,7 +381,7 @@ onMounted(async () => {
                       : ''
                   "
                 >
-                  {{ col.value ? col.value : "" }}
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
             </q-tr>