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

src/modules/05_placement/views/03_receiveMain.vue

@@ -64,6 +64,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "posTypeOld",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
   "dateOfBirth",
   "createdAt",
@@ -104,6 +107,46 @@ const columns = 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",
@@ -572,9 +615,25 @@ onMounted(async () => {
                       props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
                     }}
                   </div>
+
                   <div v-else-if="col.name == 'organizationName'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -582,7 +641,7 @@ onMounted(async () => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}