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

* 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin:

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 : [],
   );
 }
 

src/views/MainLayout.vue

@@ -357,7 +357,7 @@ async function fetchKeycloakPosition() {
     });
 }
 
-const profileImg = ref<string>("");
+const profileImg = ref<string>(avatar);
 async function getImg(id: string, pathName: string) {
   await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))