แก้ ฟิลเตอร์

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

@@ -15,7 +15,7 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
 const $q = useQuasar();
 const storeCommand = useCommandMainStore();
 const mixin = useCounterMixin();
-const { dialogConfirm, date2Thai,onSearchDataTable } = mixin;
+const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
 
 const props = defineProps({
   Modal: Boolean,
@@ -31,9 +31,11 @@ const emit = defineEmits([
   "update:selected",
 ]);
 
-const filterKeyword2 = defineModel<string>('filterKeyword2',{required:true})
-const rows = defineModel<PersonData[]>('rows',{required:true})
-const rowsData = defineModel<PersonData[]>('rowsData',{required:true})
+const filterKeyword2 = defineModel<string>("filterKeyword2", {
+  required: true,
+});
+const rows = defineModel<PersonData[]>("rows", { required: true });
+const rowsData = defineModel<PersonData[]>("rowsData", { required: true });
 
 const selected = ref<PersonData[]>([]); //ราชชื่อที่เลือกส่งไปออกคำสั่ง
 const dataMapToSend = computed(() => {
@@ -109,6 +111,9 @@ const columns2 = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    format: (val, row) => {
+      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+    },
   },
   {
     name: "typeCommand",
@@ -134,6 +139,9 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "dateOfBirth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(row.dateOfBirth);
+    },
   },
 ]);