From 293642fd02f96123744285ab103490433eca1971 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 14 Jun 2024 11:42:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B9=83=E0=B8=8A=E0=B9=89?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=20=3D>=20=E0=B9=80=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B9=83?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=89=E0=B8=87=E0=B8=B2=E0=B8=99=20=3D>=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20column=20prefix?=
 =?UTF-8?q?,=20=E0=B8=A5=E0=B8=9A=20btn=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B9=84=E0=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage/api.management.ts              |  4 ++
 .../components/Permissions/DialogAdd.vue      | 42 ++++++++++++-------
 .../components/Users/DialogAddUser.vue        |  9 ++++
 src/modules/02_users/views/listsUser.vue      | 12 +++---
 .../02_users/views/permissionsView.vue        |  3 ++
 5 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/api/manage/api.management.ts b/src/api/manage/api.management.ts
index 8256a2a2..66341b36 100644
--- a/src/api/manage/api.management.ts
+++ b/src/api/manage/api.management.ts
@@ -3,6 +3,7 @@ import env from "../index";
 const management = `${env.API_URI}/org/keycloak`;
 const managementAuth = `${env.API_URI}/org/auth/authRole`;
 const managementSys = `${env.API_URI}/org/auth/authSys`;
+const managementPermission = `${env.API_URI}/org/auth/authRole/govoment`;
 
 export default {
   management,
@@ -12,4 +13,7 @@ export default {
 
   /** จัดการบทบาทและสิทธิ์*/
   managementAuth,
+
+  /** กำหนดสิทธิ์*/
+  managementPermission,
 };
diff --git a/src/modules/02_users/components/Permissions/DialogAdd.vue b/src/modules/02_users/components/Permissions/DialogAdd.vue
index 0ad3e605..10c87a95 100644
--- a/src/modules/02_users/components/Permissions/DialogAdd.vue
+++ b/src/modules/02_users/components/Permissions/DialogAdd.vue
@@ -9,8 +9,8 @@ import DialogHeader from "@/components/DialogHeader.vue";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type { Roles } from "@/modules/02_users/interface/response/Main";
 import type { FilterReqMaster } from "@/modules/02_users/interface/request/Main";
+import type { Roles } from "@/modules/02_users/interface/response/Main";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -35,6 +35,10 @@ const props = defineProps({
     type: Function,
     required: true,
   },
+  dataPosMaster: {
+    type: Object,
+    required: true,
+  },
 });
 
 const rows = ref<Roles[]>([]);
@@ -89,17 +93,27 @@ function onSubmit() {
     dialogMessageNotify($q, "กรุณาเลือกสิทธิ์อย่างน้อง 1 สิทธิ์");
   } else {
     dialogConfirm($q, () => {
-      const arrayId = selected.value.map((e: Roles) => e.id);
-      console.log(arrayId);
-
       showLoader();
-      closeDialog();
-      props.fetchDataTable(
-        reqMaster.value.id,
-        reqMaster.value.revisionId,
-        reqMaster.value.type
-      );
-      hideLoader();
+      const arrayId = selected.value.map((e: Roles) => e.id);
+      http
+        .post(config.API.managementPermission, {
+          authRoleId: arrayId[0],
+          posMasterId: props.dataPosMaster.id,
+        })
+        .then(() => {
+          closeDialog();
+          props.fetchDataTable(
+            reqMaster.value.id,
+            reqMaster.value.revisionId,
+            reqMaster.value.type
+          );
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
     });
   }
 }
@@ -139,17 +153,17 @@ watch(
                 dense
                 :rows-per-page-options="[10, 25, 50, 100]"
                 :visible-columns="visibleColumns"
-                selection="multiple"
+                selection="single"
                 v-model:selected="selected"
               >
-                <template v-slot:header-selection="scope">
+                <!-- <template v-slot:header-selection="scope">
                   <q-checkbox
                     keep-color
                     color="primary"
                     dense
                     v-model="scope.selected"
                   />
-                </template>
+                </template> -->
 
                 <template v-slot:body="props">
                   <q-tr :props="props" class="cursor-pointer">
diff --git a/src/modules/02_users/components/Users/DialogAddUser.vue b/src/modules/02_users/components/Users/DialogAddUser.vue
index 53a9b144..e087ea83 100644
--- a/src/modules/02_users/components/Users/DialogAddUser.vue
+++ b/src/modules/02_users/components/Users/DialogAddUser.vue
@@ -49,6 +49,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "prefix",
+    align: "left",
+    label: "คำนำหน้าชื่อ",
+    sortable: true,
+    field: "prefix",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "firstName",
     align: "left",
diff --git a/src/modules/02_users/views/listsUser.vue b/src/modules/02_users/views/listsUser.vue
index 8121cbe8..8d83de92 100644
--- a/src/modules/02_users/views/listsUser.vue
+++ b/src/modules/02_users/views/listsUser.vue
@@ -109,12 +109,12 @@ const userId = ref<string>("");
 
 /** List Mune*/
 const itemMenu = ref<ItemsMenu[]>([
-  {
-    label: "แก้ไข",
-    icon: "edit",
-    color: "edit",
-    type: "edit",
-  },
+  // {
+  //   label: "แก้ไข",
+  //   icon: "edit",
+  //   color: "edit",
+  //   type: "edit",
+  // },
   {
     label: "จัดการสิทธิ์",
     icon: "mdi-account-group",
diff --git a/src/modules/02_users/views/permissionsView.vue b/src/modules/02_users/views/permissionsView.vue
index 040bf2d2..c48c9bc9 100644
--- a/src/modules/02_users/views/permissionsView.vue
+++ b/src/modules/02_users/views/permissionsView.vue
@@ -198,6 +198,7 @@ const reqMaster = reactive<FilterReqMaster>({
 const maxPage = ref<number>(0);
 const totalRow = ref<number>(0);
 const posMaster = ref<PosMaster[]>([]);
+const dataPosMaster = ref<PosMaster>();
 const pagination = ref<Pagination>({
   page: reqMaster.page,
   rowsPerPage: reqMaster.pageSize,
@@ -310,6 +311,7 @@ function updatePagination(newPagination: Pagination) {
 
 function onClickAddRole(data: PosMaster) {
   modalDialogAdd.value = true;
+  dataPosMaster.value = data;
 }
 
 /** callblck function ทำการ fetch ข้อมูล tree เมื่อมีการเปลี่ยน Tab ปัจจับัน,แบบร่าง*/
@@ -681,6 +683,7 @@ onMounted(() => {
   <DialogAdd
     v-model:modal="modalDialogAdd"
     v-model:reqMaster="reqMaster"
+    :dataPosMaster="dataPosMaster as PosMaster"
     :fetchDataTable="fetchDataTable"
   />
 </template>