From 9c448c86e29bcde1a6728614e01b9641c10c4d37 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 20 Jan 2025 13:48:26 +0700
Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20kpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/14_KPI/views/detail.vue     | 2 +-
 src/modules/14_KPI/views/detailView.vue | 2 +-
 src/modules/14_KPI/views/mainDetail.vue | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/14_KPI/views/detail.vue b/src/modules/14_KPI/views/detail.vue
index 8fe645f76..324e79c47 100644
--- a/src/modules/14_KPI/views/detail.vue
+++ b/src/modules/14_KPI/views/detail.vue
@@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { FormProfile } from "@/modules/14_KPI/interface/request/Index";
+import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 
 // const modalScore = ref<boolean>(false);
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index 7a87cd9c0..6735cfbdc 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -332,7 +332,7 @@ function openGovernment() {
 }
 
 function openStatus() {
-  router.push(`/probation-detail/${store.dataEvaluation.profileId}`);
+  router.push(`/probation-detail/${store.dataEvaluation.id}`);
 }
 
 function sendToEvauator() {
diff --git a/src/modules/14_KPI/views/mainDetail.vue b/src/modules/14_KPI/views/mainDetail.vue
index 2692a83b6..4f243ba2a 100644
--- a/src/modules/14_KPI/views/mainDetail.vue
+++ b/src/modules/14_KPI/views/mainDetail.vue
@@ -33,6 +33,9 @@ const mode = ref<any>($q.screen.gt.xs);
 const profileImg = ref<string>("");
 const router = useRouter();
 const route = useRoute();
+const id = ref<string>(route.params.id as string);
+
+
 const idEva = ref<string>(route.params.id as string);
 const formData = reactive<any>({
   prefix: "",
@@ -115,10 +118,12 @@ function onResize(size: any) {
 /**
  * fetch ข้แมูลส่วนตัว
  */
+
+ // เส้นเก่าที่เคยใช้     .get(config.API.kpiEvaluationUser + `/admin/${id.value}`)
 async function getMain() {
   showLoader();
   await http
-    .get(config.API.profilePosition + `/${idEva.value}`)
+    .get(config.API.kpiEvaluationUser + `/admin/${id.value}`)
     .then(async (res) => {
       const data = await res.data.result;
       formData.prefix = data.prefix;

From 869c5ec521e4d741441c0d89b8abb56d80aae6b7 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 20 Jan 2025 14:03:58 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Salary/01_PositionSalary.vue           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 5650fe714..f6b4cc0d7 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -1136,8 +1136,6 @@ onMounted(() => {
                 label="เงินค่าตอบแทนพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="empType !== '-temp'? [(val:string) => !!val || `${'กรุณากรอกเงินค่าตอบแทนพิเศษ'}`]:[]"
-                lazy-rules
                 hide-bottom-space
               />
             </div>
@@ -1198,13 +1196,10 @@ onMounted(() => {
                 ref="docRef"
                 outlined
                 dense
-                lazy-rules
                 borderless
                 v-model="formDataSalary.doc"
                 :label="`${'เอกสารอ้างอิง'}`"
                 type="textarea"
-                hide-bottom-space
-                :rules="empType !== '-temp'? [(val: number) => !!val  || `${'กรุณากรอกเอกสารอ้างอิง'}`]:[]"
               />
             </div>
           </div>

From fa90c0016acfc14abcc21f842d42df131b2f92ba Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 20 Jan 2025 16:07:49 +0700
Subject: [PATCH 3/3] fixing landing redirect

---
 src/views/MainLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index bfa7c088b..d01fad814 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -84,7 +84,7 @@ const modalLoginLinkage = ref<boolean>(false); //เข้าสู่ระบ
 // landing page redirect
 const landingPageUrl = ref<string>(getLandingUrl());
 function getLandingUrl() {
-  return `${configParam.landingPageUrl}/landing`;
+  return configParam.landingPageUrl;
 }
 
 async function fetchmsgNoread() {