From 6291dfea776bdc7d1f4a84106a314ece141d9f89 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Fri, 28 Jun 2024 17:52:30 +0700 Subject: [PATCH] map data --- .../components/viewstep/viewStep1.vue | 85 ++++++++++++++----- 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index 07607ec..5fe08bb 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -40,7 +40,7 @@ const props = defineProps({ const emit = defineEmits(["update:formDeital"]); -const formDetail = reactive({ +const formDetail = reactive({ userId: "", citizenId: "", prefix: "", @@ -52,6 +52,11 @@ const formDetail = reactive({ posNo: "", birthDate: "", govAge: "", + govAgeMap: { + year: 0, + month: 0, + day: 0, + }, educations: [] as EducationForm[], certificates: [], salaries: [], @@ -72,7 +77,6 @@ async function fetchDetail() { formDetail.fullName = `${data.firstName} ${data.lastName}`; formDetail.position = data.position; formDetail.oc = data.rootShortName; - // formDetail.salary = data.salary ? formattedNumber(data.salary) : ""; // ยังไม่มี formDetail.positionLevel = data.posLevelName; formDetail.posNo = data.rootShortName + data.posMasterNo; formDetail.birthDate = data.birthDate && date2Thai(data.birthDate); @@ -111,14 +115,26 @@ async function fetchDetail() { salaryRef: e.salaryRef ? e.salaryRef : "", salaryStatus: e.salaryStatus ? e.salariesStatus : "", // - oc: "-", - lineWork: "-", - side: "-", - positionType: "-", - level: "-", - positionsAdministrative: "-", - aspectAdministrative: "-", + oc: "-",//ไม่มี + lineWork: e.positionLine ? e.positionLine : "-", + side: e.positionPathSide ? e.positionPathSide : "-", + positionType: e.positionType ? e.positionType : "-", + level: e.positionLevel ? e.positionLevel : "-", + positionsAdministrative: e.positionExecutive + ? e.positionExecutive + : "-", + aspectAdministrative: "-",//ไม่มี })); + console.log( + "🚀 ~ formDetail.salaries=res.data.result.map ~ formDetail.salaries:", + formDetail.salaries + ); + + formDetail.salary = formDetail.salaries + ? formattedNumber( + formDetail.salaries[formDetail.salaries.length - 1].amount + ) + : ""; }); http.get(config.API.dataUserCertificate("training")).then((res) => { @@ -163,7 +179,6 @@ async function fetchCheckSpec(data: any) { formDetail.positionLevel = data.positionLevel; formDetail.posNo = data.posNo; formDetail.birthDate = data.birthDate && date2Thai(data.birthDate); - formDetail.govAge = data.govAge; formDetail.educations = data.educations; formDetail.certificates = data.certificates.map((e: CertificatesForm) => ({ @@ -222,9 +237,29 @@ function formattedNumber(x: number) { } } +/** get data */ +function getData() { + showLoader(); + http + .get(config.API.dataUserGovernment) + .then((res) => { + const data = res.data.result; + formDetail.govAge = data.govAge + ? `${data.govAge.year} วัน ${data.govAge.month} เดือน ${data.govAge.year} ปี` + : ""; + }) + .catch((e) => { + messageError($q, e); + }) + .finally(() => { + hideLoader(); + }); +} + onMounted(async () => { route.name === "evaluate-add" && (await fetchDetail()); props.data && fetchCheckSpec(props.data); + getData(); }); @@ -315,7 +350,7 @@ onMounted(async () => { @@ -350,7 +385,9 @@ onMounted(async () => { @@ -359,7 +396,7 @@ onMounted(async () => { @@ -367,7 +404,9 @@ onMounted(async () => {
@@ -377,7 +416,9 @@ onMounted(async () => {
@@ -386,7 +427,9 @@ onMounted(async () => {
@@ -406,7 +449,7 @@ onMounted(async () => {
@@ -415,7 +458,7 @@ onMounted(async () => {
@@ -423,7 +466,7 @@ onMounted(async () => {
@@ -432,7 +475,7 @@ onMounted(async () => { @@ -441,7 +484,7 @@ onMounted(async () => {