บรรจุแต่งตั้ง

src/modules/05_placement/components/Receive/DialogOrders.vue

@@ -86,6 +86,45 @@ const columns2 = ref<QTableProps["columns"]>([
       return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posTypeOld",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "posTypeOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionTypeOld
+        ? `${row.positionTypeOld}${
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+          }`
+        : "";
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
+  },
   {
     name: "organizationName",
     align: "left",
@@ -149,6 +188,9 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "posTypeOld",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
   "dateOfBirth",
   "createdAt",