From a9d5fc37702f4b5c2eb1df173791fb3a40086ceb Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 29 Nov 2024 10:33:41 +0700
Subject: [PATCH] filter KPI

---
 .../06_evaluate/components/EvaluateStepMain.vue       |  6 +++---
 src/modules/06_evaluate/components/step/step2.vue     |  1 +
 .../06_evaluate/components/viewstep/viewStep1.vue     | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 4b22ba5..2bd0d2f 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -239,7 +239,6 @@ function checkSelectForm() {
     ? dialogConfirm(
         $q,
         async () => {
-          showLoader();
           saveStep1();
         },
         "ยืนยันการดำเนินการ",
@@ -250,6 +249,7 @@ function checkSelectForm() {
 
 /** function บันทักตรวจสอบคุณสมบัติ*/
 async function saveStep1() {
+  showLoader();
   const salaries = formDetail.value.salaries.map((e: any) => ({
     amount: e.amount,
     date: e.date,
@@ -286,9 +286,9 @@ async function saveStep1() {
     userId: formDetail.value.id,
     citizenId: formDetail.value.citizenId,
     prefix: formDetail.value.prefix,
-    fullName: `${formDetail.value.firstName} ${formDetail.value.lastName}`,
+    fullName: `${formDetail.value.prefix}${formDetail.value.firstName} ${formDetail.value.lastName}`,
     position: formDetail.value.position,
-    oc: formDetail.value.oc,
+    oc: formDetail.value.org,
     salary: formDetail.value.salary ? formDetail.value.salary.toString() : null,
     positionLevel: formDetail.value.positionLevel,
     posNo: formDetail.value.posNo,
diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index 9ba9503..3b286f8 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -211,6 +211,7 @@ function fetcheSigner(id: string) {
     .get(config.API.evaluationSignerDoc1(id))
     .then((res) => {
       const data = res.data.result;
+
       formCommand.commanderFullname = data.commanderFullname;
       formCommand.commanderPosition = data.commanderPosition;
       formCommand.commanderAboveFullname = data.commanderAboveFullname;
diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index 00b2f1e..cbec102 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -83,6 +83,7 @@ async function fetchDetail() {
       formDetail.posNo = data.rootShortName + data.posMasterNo;
       formDetail.birthDate = data.birthDate;
       formDetail.govAge = data.govAge; // ยังไม่มี
+      formDetail.salary = data.salary;
 
       http.get(config.API.dataUserEducations).then((res) => {
         formDetail.educations = res.data.result;
@@ -102,11 +103,11 @@ async function fetchDetail() {
 
       http.get(config.API.dataUserSalary).then((res) => {
         formDetail.salaries = res.data.result;
-        formDetail.salary = formDetail.salaries
-          ? formattedNumber(
-              formDetail.salaries[formDetail.salaries.length - 1].amount
-            )
-          : "";
+        // formDetail.salary = formDetail.salaries
+        //   ? formattedNumber(
+        //       formDetail.salaries[formDetail.salaries.length - 1].amount
+        //     )
+        //   : "";
       });
 
       http.get(config.API.dataUserCertificate("training")).then((res) => {