From 31ded32b368b4879f72ccc99ecc0f7ed20df437e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 25 Sep 2023 13:16:03 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20table=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=93=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ListRetirement/TableList.vue   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 04aa54d64..0ffa0a3f0 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -61,6 +61,16 @@ const columns = ref<any["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "positionEmployeeGroup",
+    align: "left",
+    label: "กลุ่มงาน",
+    title: "กลุ่มงาน",
+    // subtitle: "ในสายงาน/ระดับ",
+    field: "positionEmployeeGroup",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "positionEmployeePosition",
     align: "left",
@@ -81,16 +91,7 @@ const columns = ref<any["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "positionEmployeeGroup",
-    align: "left",
-    label: "กลุ่มงาน",
-    title: "กลุ่มงาน",
-    // subtitle: "ในสายงาน/ระดับ",
-    field: "positionEmployeeGroup",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
   {
     name: "positionNumber",
     align: "left",
@@ -180,7 +181,7 @@ const fecthlistprofile = async (id: string) => {
         organizationOrganization: e.organizationOrganization,
         positionEmployeePosition: e.positionEmployeePosition,
         positionEmployeeLevel: e.positionEmployeeLevel,
-        positionNumber: e.posNo,
+        positionNumber: e.posNoEmployee,
         positionEmployeeGroup: e.positionEmployeeGroup,
         bureau: e.oc,
         reason: e.reason,
@@ -561,24 +562,23 @@ const paginationLabel = (start: number, end: number, total: number) => {
               @click.stop="router.push(`/registry/${props.row.profileId}`)"
             >
               <q-td key="order" :props="props">{{ props.row.order }} </q-td>
-              <q-td key="name" :props="props">{{
-                 props.row.name
-              }}</q-td>
+              <q-td key="name" :props="props">{{ props.row.name }}</q-td>
               <q-td
                 class="table_ellipsis"
                 key="organizationOrganization"
                 :props="props"
                 >{{ props.row.organizationOrganization }}</q-td
               >
+              <q-td key="positionEmployeeGroup" :props="props">{{
+                props.row.positionEmployeeGroup
+              }}</q-td>
               <q-td key="positionEmployeePosition" :props="props">{{
                 props.row.positionEmployeePosition
               }}</q-td>
               <q-td key="positionEmployeeLevel" :props="props">{{
                 props.row.positionEmployeeLevel
               }}</q-td>
-              <q-td key="positionEmployeeGroup" :props="props">{{
-                props.row.positionEmployeeGroup
-              }}</q-td>
+
               <q-td key="positionNumber" :props="props">{{
                 props.row.positionNumber
               }}</q-td>