From 1739f5bae3ce7e7bb35cadfc5473a35f9ff7a63d Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 28 Jun 2024 16:51:48 +0700 Subject: [PATCH] updated --- src/api/evaluate/api.evaluate.ts | 2 +- .../06_evaluate/components/ExpertPage.vue | 9 +- .../06_evaluate/components/step/step1.vue | 4 +- .../components/viewstep/viewStep1.vue | 116 ++++++++++-------- src/modules/06_evaluate/router.ts | 6 +- 5 files changed, 75 insertions(+), 62 deletions(-) diff --git a/src/api/evaluate/api.evaluate.ts b/src/api/evaluate/api.evaluate.ts index 46eb563..c79b9fb 100644 --- a/src/api/evaluate/api.evaluate.ts +++ b/src/api/evaluate/api.evaluate.ts @@ -24,7 +24,7 @@ export default { evaluationWaitCheck: (id: string) => `${evaluation}/wait-check-doc-v2/${id}`, evaluationDoc2: (id: string) => `${evaluation}/doc2/reject/${id}`, evaluationHistory: (id: string) => `${evaluation}/step-history/${id}`, - evaluationDetail: () => `${env.API_URI}/profile/keycloak/position`, + evaluationDetail: () => `${env.API_URI}/profile/keycloak`, evaluationSignerDoc1: (id: string) => `${evaluation}/doc1-signer/${id}`, evaluationSignerDoc2: (id: string) => `${evaluation}/doc2-signer/${id}`, evaluationDirectorMeetring: (id: string) => diff --git a/src/modules/06_evaluate/components/ExpertPage.vue b/src/modules/06_evaluate/components/ExpertPage.vue index 54e7137..e56a184 100644 --- a/src/modules/06_evaluate/components/ExpertPage.vue +++ b/src/modules/06_evaluate/components/ExpertPage.vue @@ -1,5 +1,5 @@ - diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index c4170ff..07607ec 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -63,7 +63,7 @@ const formDetail = reactive({ async function fetchDetail() { showLoader(); await http - .get(config.API.evaluationDetail()) + .get(config.API.positionBykeycloak()) .then((res) => { const data = res.data.result; formDetail.userId = data.id; @@ -71,59 +71,71 @@ async function fetchDetail() { formDetail.prefix = data.prefix; formDetail.fullName = `${data.firstName} ${data.lastName}`; formDetail.position = data.position; - formDetail.oc = data.oc; - formDetail.salary = data.salary ? formattedNumber(data.salary) : ""; - formDetail.positionLevel = data.positionLevel; - formDetail.posNo = data.posNo; + 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); - formDetail.govAge = data.govAge; - formDetail.educations = data.educations; - formDetail.certificates = data.certificates.map( - (e: CertificatesForm) => ({ - certificateNo: e.certificateNo, - certificateType: e.certificateType, - expireDate: date2Thai(e.expireDate), - issueDate: date2Thai(e.issueDate), - issuer: e.issuer, - }) - ); - formDetail.salaries = data.salaries.map((e: any) => ({ - amount: e.amount, - date: date2Thai(e.date), - mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0, - posNo: e.posNo, - position: e.position, - positionSalaryAmount: e.positionSalaryAmount - ? e.positionSalaryAmount - : 0, - refCommandDate: e.refCommandDate ? e.refCommandDate : "", + formDetail.govAge = data.govAge; // ยังไม่มี - refCommandNo: e.refCommandNo ? e.refCommandNo : "", - salaryClass: e.salaryClass ? e.salaryClass : "", - salaryRef: e.salaryRef ? e.salaryRef : "", - salaryStatus: e.salaryStatus ? e.salariesStatus : "", - // - oc: "-", - lineWork: "-", - side: "-", - positionType: "-", - level: "-", - positionsAdministrative: "-", - aspectAdministrative: "-", - })); - formDetail.trainings = data.trainings.map((e: any) => ({ - dateOrder: date2Thai(e.dateOrder), - department: e.department, - duration: e.duration, - endDate: date2Thai(e.endDate), - name: e.name, - numberOrder: e.numberOrder, - place: e.place, - startDate: date2Thai(e.startDate), - topic: e.topic, - yearly: e.yearly, - })); - formDetail.assessments = data.assessments; + http.get(config.API.dataUserEducations).then((res) => { + formDetail.educations = res.data.result; + }); + + http.get(config.API.dataUserCertificate("certificate")).then((res) => { + formDetail.certificates = res.data.result.map( + (e: CertificatesForm) => ({ + certificateNo: e.certificateNo, + certificateType: e.certificateType, + expireDate: date2Thai(e.expireDate), + issueDate: date2Thai(e.issueDate), + issuer: e.issuer, + }) + ); + }); + + http.get(config.API.dataUserSalary).then((res) => { + formDetail.salaries = res.data.result.map((e: any) => ({ + amount: e.amount, + date: date2Thai(e.date), + mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0, + posNo: e.posNo, + position: e.position, + positionSalaryAmount: e.positionSalaryAmount + ? e.positionSalaryAmount + : 0, + refCommandDate: e.refCommandDate ? e.refCommandDate : "", + + refCommandNo: e.refCommandNo ? e.refCommandNo : "", + salaryClass: e.salaryClass ? e.salaryClass : "", + salaryRef: e.salaryRef ? e.salaryRef : "", + salaryStatus: e.salaryStatus ? e.salariesStatus : "", + // + oc: "-", + lineWork: "-", + side: "-", + positionType: "-", + level: "-", + positionsAdministrative: "-", + aspectAdministrative: "-", + })); + }); + + http.get(config.API.dataUserCertificate("training")).then((res) => { + formDetail.trainings = res.data.result.map((e: any) => ({ + dateOrder: date2Thai(e.dateOrder), + department: e.department, + duration: e.duration, + endDate: date2Thai(e.endDate), + name: e.name, + numberOrder: e.numberOrder, + place: e.place, + startDate: date2Thai(e.startDate), + topic: e.topic, + yearly: e.yearly, + })); + }); + // formDetail.assessments = data.assessments; emit("update:formDeital", data); }) .catch((err) => { diff --git a/src/modules/06_evaluate/router.ts b/src/modules/06_evaluate/router.ts index eb5530f..2f97ceb 100644 --- a/src/modules/06_evaluate/router.ts +++ b/src/modules/06_evaluate/router.ts @@ -2,8 +2,10 @@ const evaluateMain = () => import("@/modules/06_evaluate/views/EvaluateMain.vue"); const evaluateStep = () => import("@/modules/06_evaluate/components/EvaluateStepMain.vue"); -const expertPage = () => import('@/modules/06_evaluate/components/ExpertPage.vue') -const expertPageDetail = () => import('@/modules/06_evaluate/components/ExpertPageDetail.vue') +const expertPage = () => + import("@/modules/06_evaluate/components/ExpertPage.vue"); +const expertPageDetail = () => + import("@/modules/06_evaluate/components/ExpertPageDetail.vue"); export default [ { path: "/evaluate",