From 7d4af6044b31b97894d17f2ea561ee5c318484e8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 19 Jun 2024 09:59:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B8=E0=B8=97=E0=B8=98=E0=B8=A3=E0=B8=93=E0=B9=8C?=
 =?UTF-8?q?/=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=97=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=81=E0=B8=82=E0=B9=8C=20=3D>=20=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/appeal/api.appeal.ts                | 28 ++++++++++++++-------
 src/modules/07_appealComplain/views/Add.vue | 14 +++++------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/api/appeal/api.appeal.ts b/src/api/appeal/api.appeal.ts
index c0c19b9..0f1348c 100644
--- a/src/api/appeal/api.appeal.ts
+++ b/src/api/appeal/api.appeal.ts
@@ -1,14 +1,24 @@
-import env from "../index"
+import env from "../index";
 
-const appeal = `${env.API_URI}/discipline/complaint_appeal`
-const profile = `${env.API_URI}/profile/keycloak`
+const appeal = `${env.API_URI}/discipline/complaint_appeal`;
+const profile = `${env.API_URI}/profile/keycloak`;
 
 export default {
-	profileBykeycloak:()=>`${profile}`,
-	appealMainList:(status: string, type: string, year: number, page: number, pageSize: number, keyword: string)=>`${appeal}/user?status=${status}&type=${type}&year=${year}&page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
-	appealAdd:()=>`${appeal}`,
+  profileBykeycloak: () => `${profile}`,
+  positionBykeycloak: () => `${env.API_URI}/org/profile/keycloak/position`,
 
-	appealByID:(id:string)=>`${appeal}/${id}`,
+  appealMainList: (
+    status: string,
+    type: string,
+    year: number,
+    page: number,
+    pageSize: number,
+    keyword: string
+  ) =>
+    `${appeal}/user?status=${status}&type=${type}&year=${year}&page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
+  appealAdd: () => `${appeal}`,
 
-	appealByPrintReport:(id:string)=>`${appeal}/report/${id}`
-}
+  appealByID: (id: string) => `${appeal}/${id}`,
+
+  appealByPrintReport: (id: string) => `${appeal}/report/${id}`,
+};
diff --git a/src/modules/07_appealComplain/views/Add.vue b/src/modules/07_appealComplain/views/Add.vue
index cd2870d..2389b6a 100644
--- a/src/modules/07_appealComplain/views/Add.vue
+++ b/src/modules/07_appealComplain/views/Add.vue
@@ -12,7 +12,7 @@ const router = useRouter();
 const $q = useQuasar();
 const mixin = useCounterMixin();
 
-const { fails, success, messageError, showLoader, hideLoader } = mixin;
+const { findOrgName, success, messageError, showLoader, hideLoader } = mixin;
 
 const formProfile = reactive<any>({
   profileId: "",
@@ -24,13 +24,13 @@ const formProfile = reactive<any>({
 function getProFile() {
   showLoader();
   http
-    .get(config.API.profileBykeycloak())
+    .get(config.API.positionBykeycloak())
     .then((res) => {
       const data = res.data.result;
-      formProfile.profileId = data.id;
+      formProfile.profileId = data.profileId;
       formProfile.fullname = `${data.prefix}${data.firstName} ${data.lastName}`;
       formProfile.citizenId = data.citizenId;
-      formProfile.oc = data.oc;
+      formProfile.oc = findOrgName(data);
       formProfile.position = data.position;
     })
     .catch((e) => {
@@ -53,9 +53,9 @@ function onSubmit(data: any) {
   formData.append("title", data.title);
   formData.append("description", data.description);
   formData.append("type", data.type);
-  formData.append("year", '');
-  formData.append("caseType", '');
-  formData.append("caseNumber", '');
+  formData.append("year", "");
+  formData.append("caseType", "");
+  formData.append("caseNumber", "");
   formData.append("file", data.files);
   formData.append("oc", data.oc);
   formData.append("position", data.position);