fixing column บรรจุ แต่งตั้ง ย้าย

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

@@ -23,8 +23,7 @@ const {
   messageError,
   dialogConfirm,
   hideLoader,
-  findOrgName,
-  findPosMasterNo,
+  findPosMasterNoOld,
   date2Thai,
 } = mixin;
 
@@ -51,26 +50,17 @@ const columns2 = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "posNo",
+    name: "posMasterNoOld",
     align: "left",
     label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posNo",
+    field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return findPosMasterNo(row);
+      return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
@@ -80,20 +70,25 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.posTypeName} (${row.posLevelName})`;
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
     },
   },
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่งและหน่วยงานเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "organization",
@@ -128,8 +123,7 @@ const columns2 = ref<QTableProps["columns"]>([
 const visibleColumns2 = ref<string[]>([
   "no",
   "name",
-  "posNo",
-  "position",
+  "posMasterNoOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",