ปรับ table รายชื่อผู้เกษียณอายุราชการ

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>