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

src/modules/05_placement/components/Help-Government/DialogOrders.vue

@@ -16,14 +16,8 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
 /** use*/
 const $q = useQuasar();
 const { statusText } = useTransferDataStore();
-const {
-  dialogConfirm,
-  findOrgNameOld,
-  findPosMasterNoOld,
-  date2Thai,
-  onSearchDataTable,
-  findOrgNameOldHtml,
-} = useCounterMixin();
+const { dialogConfirm, findPosMasterNoOld, date2Thai, onSearchDataTable } =
+  useCounterMixin();
 
 /** props*/
 const props = defineProps({
@@ -66,7 +60,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
@@ -75,19 +69,10 @@ const columns2 = 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",
@@ -112,7 +97,11 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val, row) => findOrgNameOld(row),
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
   },
   {
     name: "organization",
@@ -168,7 +157,6 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "name",
   "posMasterNoOld",
-  "positionOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",
@@ -310,7 +298,7 @@ function onSearch() {
                       v-else-if="col.name === 'organizationPositionOld'"
                       class="text-html"
                     >
-                      {{ findOrgNameOldHtml(props.row) }}
+                      {{ col.value }}
                     </div>
 
                     <div v-else>