From 5c68d4be8c38faaf54a2a73e608035443649b9b7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 Nov 2024 11:20:16 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/02_organizational/api.organization.ts        |  3 ++-
 .../02_users/components/Users/DialogFormUser.vue     | 12 ++++++++++--
 src/modules/02_users/views/01_user.vue               |  5 +++--
 src/modules/05_command/views/lists.vue               |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index 42094c21..80a976f5 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -96,7 +96,8 @@ export default {
 
   orgDeceasedProfile: `${orgPos}/profile/search`,
 
-  orgProfileListKeycloak: () => `${orgProfile}/search-personal-no-keycloak`,
+  orgProfileListKeycloak: (type: string) =>
+    `${orgProfile}${type}/search-personal-no-keycloak`,
 
   /** กำหนดสิทธิ์จัดการโครงสร้าง */
   permissionOrg: `${organization}/permission-org`,
diff --git a/src/modules/02_users/components/Users/DialogFormUser.vue b/src/modules/02_users/components/Users/DialogFormUser.vue
index 4dc62fe5..b6da2137 100644
--- a/src/modules/02_users/components/Users/DialogFormUser.vue
+++ b/src/modules/02_users/components/Users/DialogFormUser.vue
@@ -35,6 +35,10 @@ const props = defineProps({
     type: Function,
     required: true,
   },
+  employeeClass: {
+    type: String,
+    required: true,
+  },
 });
 
 // Table
@@ -142,8 +146,9 @@ function fetchListUser() {
   };
   http
     .post(
-      config.API.orgProfileListKeycloak() +
-        `?page=${query.page}&pageSize=${query.pageSize}`,
+      config.API.orgProfileListKeycloak(
+        props.employeeClass === "employee" ? "-employee" : ""
+      ) + `?page=${query.page}&pageSize=${query.pageSize}`,
       body
     )
     .then(async (res) => {
@@ -221,6 +226,8 @@ function onSubmit() {
     showLoader();
     const url = isStatusEdit.value
       ? config.API.managementUser + `/${userId.value}`
+      : props.employeeClass === "employee"
+      ? config.API.managementUser + `/emp`
       : config.API.managementUser;
 
     http[isStatusEdit.value ? "put" : "post"](url, {
@@ -245,6 +252,7 @@ function onSubmit() {
  * ฟังก์ชัน ปิด Dialog และกำหนด ตัวแปรไปเป็นค่า defult
  */
 function closeDialog() {
+  rows.value = [];
   modal.value = false;
   formData.profileId = "";
   formData.username = "";
diff --git a/src/modules/02_users/views/01_user.vue b/src/modules/02_users/views/01_user.vue
index f51311a8..1c1fa14e 100644
--- a/src/modules/02_users/views/01_user.vue
+++ b/src/modules/02_users/views/01_user.vue
@@ -501,8 +501,9 @@ onMounted(async () => {
   <DialogAddUser
     :fetchlist="fetchListUsers"
     v-model:modal="modalDialogAdd"
-    v-model:isStatusEdit="isStatusEdit"
-    :userId="userId"
+    v-model:is-status-edit="isStatusEdit"
+    :user-id="userId"
+    :employee-class="employeeClass"
   />
 </template>
 
diff --git a/src/modules/05_command/views/lists.vue b/src/modules/05_command/views/lists.vue
index ef294800..68941cff 100644
--- a/src/modules/05_command/views/lists.vue
+++ b/src/modules/05_command/views/lists.vue
@@ -89,7 +89,7 @@ async function fetchCommandType() {
         page: page.value,
         pageSize: pageSize.value,
         isActive: isActive.value,
-        search: keyword.value,
+        keyword: keyword.value,
       },
     })
     .then(async (res) => {