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

src/modules/05_placement/views/04_helpGovernmentMain.vue

@@ -28,10 +28,8 @@ const {
   hideLoader,
   success,
   dialogRemove,
-  findOrgNameOld,
   findPosMasterNoOld,
   onSearchDataTable,
-  findOrgNameOldHtml,
 } = mixin;
 
 /** Table*/
@@ -69,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
@@ -78,19 +76,10 @@ const columns = ref<QTableProps["columns"]>([
       return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "positionOld",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "positionOld",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -110,12 +99,16 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px;min-width: 280px",
     style: "font-size: 14px",
-    format: (val, row) => findOrgNameOld(row),
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
   },
   {
     name: "organization",
@@ -409,7 +402,7 @@ onMounted(async () => {
                     v-else-if="col.name === 'organizationPositionOld'"
                     class="text-html"
                   >
-                    {{ findOrgNameOldHtml(props.row) }}
+                    {{ col.value }}
                   </div>
 
                   <div v-else>