Merge branch 'develop' of https://github.com/Frappet/bma-ehr-admin into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-06-16 14:01:57 +07:00
commit e4ff755a2c

View file

@ -37,6 +37,7 @@ const visibleColumns = ref<string[]>([
"amount", "amount",
"createdAt", "createdAt",
"createdFullName", "createdFullName",
"accessType",
]); ]);
const columns = ref<QTableProps["columns"]>([ const columns = ref<QTableProps["columns"]>([
{ {
@ -62,6 +63,22 @@ const columns = ref<QTableProps["columns"]>([
.join(""); .join("");
}, },
}, },
{
name: "accessType",
align: "left",
label: "การเข้าถึง",
sortable: true,
field: "accessType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
if (val === "ALL") {
return `ทั้งหมด`;
} else {
return `${val} (${row.orgName})`;
}
},
},
{ {
name: "amount", name: "amount",
align: "left", align: "left",
@ -147,7 +164,7 @@ function serchDataTable() {
rows.value = onSearchDataTable( rows.value = onSearchDataTable(
keyword.value, keyword.value,
rowsMain.value, rowsMain.value,
columns.value ? columns.value : [] columns.value ? columns.value : [],
); );
} }