บรรจุ => ปรับ รายการช่วยราชการ,รายการส่งตัวกลับ

src/modules/05_placement/components/Repatriate/RepatriateMain.vue

@@ -30,6 +30,8 @@ const {
   hideLoader,
   success,
   dialogRemove,
+  findOrgName,
+  findPosMasterNo,
 } = mixin;
 
 const visibleColumns = ref<string[]>([
@@ -73,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posNo",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
     field: "posNo",
     headerStyle: "font-size: 14px",
@@ -91,7 +93,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionLevel",
     align: "left",
-    label: "ระดับ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -181,8 +183,13 @@ const getData = async () => {
         id: item.id,
         fullname: `${item.prefix}${item.firstName} ${item.lastName}`,
         position: item.position,
-        posNo: item.posNo,
-        positionLevel: item.positionLevel,
+        posNo: findPosMasterNo(item),
+        positionLevel:
+          item.posTypeName == null && item.posLevelName == null
+            ? "-"
+            : (item.posTypeName != null ? item.posTypeName : "") +
+              " " +
+              (item.posLevelName != null ? ` (${item.posLevelName})` : ""),
         createdAt: date2Thai(item.createdAt),
         organization: item.organization,
         reason: item.reason,
@@ -323,7 +330,7 @@ onMounted(async () => {
                   :props="props"
                   @click="openDetail(props.row.id)"
                 >
-                  {{ props.row.position }}
+                  {{ props.row.position ?? "-" }}
                 </q-td>
                 <q-td
                   key="positionLevel"