Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin into dev

* 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin:
Merge branch 'develop' into dev
2026-05-28 09:53:31 +07:00 · 2026-05-28 09:53:24 +07:00 · 2026-05-28 09:53:09 +07:00 · 2026-05-28 09:52:24 +07:00
1 changed files with 18 additions and 1 deletions
--- a/src/modules/06_webservices/view/listView.vue
+++ b/src/modules/06_webservices/view/listView.vue
@ -37,6 +37,7 @@ const visibleColumns = ref<string[]>([
  "amount",
  "createdAt",
  "createdFullName",
+  "accessType",
 ]);
 const columns = ref<QTableProps["columns"]>([
  {
@ -62,6 +63,22 @@ const columns = ref<QTableProps["columns"]>([
        .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",
    align: "left",
@ -147,7 +164,7 @@ function serchDataTable() {
  rows.value = onSearchDataTable(
    keyword.value,
    rowsMain.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
  );
 }
Author	SHA1	Message	Date
waruneeauy	4a2a4eb3a3	Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 2m0s Details * 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin:	2026-05-28 09:53:31 +07:00
waruneeauy	0420b4cdbd	Merge branch 'develop' into dev * develop: update manage web services list add access fix: default profileImg fix(issues): statusOptions value fix reafactor(issues): add status HELPDESK_IN_PROGRESS and REPLIED	2026-05-28 09:53:24 +07:00
waruneeauy	4a8d6fb5d7	Merge branch 'develop' of github.com:Frappet/hrms-admin into develop * 'develop' of github.com:Frappet/hrms-admin: fix: default profileImg	2026-05-28 09:53:09 +07:00
waruneeauy	dfd20c97dc	update manage web services list add access	2026-05-28 09:52:24 +07:00