หน้ารายการประเมิน

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue

@@ -50,10 +50,8 @@ const formDetail = reactive({
 
 onMounted(() => {
   if (props.data) {
-    // formDetail.userId = props.data.id;
-    // formDetail.citizenId = props.data.citizenId;
     formDetail.prefix = props.data.prefix;
-    formDetail.fullName = `${props.data.firstName}  ${props.data.lastName}`;
+    formDetail.fullName = props.data.fullName;
     formDetail.position = props.data.position;
     formDetail.oc = props.data.oc;
     formDetail.salary = props.data.salary
@@ -64,10 +62,12 @@ onMounted(() => {
     formDetail.birthDate =
       props.data.birthDate && date2Thai(props.data.birthDate);
     formDetail.govAge = props.data.govAge;
-    formDetail.educations = props.data.educations;
+    formDetail.educations = props.data.education;
 
-    formDetail.certificates = props.data.certificates
-      ? props.data.certificates.map((e: CertificatesForm) => ({
+    console.log(props.data.certificate);
+
+    formDetail.certificates = props.data.certificate
+      ? props.data.certificate.map((e: CertificatesForm) => ({
           certificateNo: e.certificateNo,
           certificateType: e.certificateType,
           expireDate: date2Thai(e.expireDate),
@@ -75,6 +75,9 @@ onMounted(() => {
           issuer: e.issuer,
         }))
       : [];
+
+    console.log(formDetail.certificates);
+
     formDetail.salaries = props.data.salaries
       ? props.data.salaries.map((e: any) => ({
           amount: e.amount,
@@ -102,8 +105,8 @@ onMounted(() => {
         }))
       : [];
 
-    formDetail.trainings = props.data.trainings
-      ? props.data.trainings.map((e: any) => ({
+    formDetail.trainings = props.data.training
+      ? props.data.training.map((e: any) => ({
           dateOrder: date2Thai(e.dateOrder),
           department: e.department,
           duration: e.duration,
@@ -116,7 +119,7 @@ onMounted(() => {
           yearly: e.yearly,
         }))
       : [];
-    formDetail.assessments = props.data.assessments;
+    formDetail.assessments = props.data.assessment;
   }
 });
 </script>