From 6711c72f4b35f9723c7cfe51c4fb732eefb7869f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 4 Jan 2024 16:54:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_evaluate/components/DialogMain.vue         | 1 +
 src/modules/06_evaluate/components/viewstep/viewStep1.vue | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_evaluate/components/DialogMain.vue b/src/modules/06_evaluate/components/DialogMain.vue
index 3220179..2d7c8ba 100644
--- a/src/modules/06_evaluate/components/DialogMain.vue
+++ b/src/modules/06_evaluate/components/DialogMain.vue
@@ -44,6 +44,7 @@ function onCklicNext() {
       const type = props.menu ? props.menu.val?.toLowerCase() : "";
       store.step = 1;
       store.currentStep = 1;
+      store.statusUpload = false;
       router.push(`/evaluate/add/${type}`);
     },
     "ยืนยันการดำเนินการ",
diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index 8f20fea..de61a05 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -148,9 +148,9 @@ async function fetchCheckSpec(data: any) {
   formDetail.posNo = data.posNo;
   formDetail.birthDate = data.birthDate && date2Thai(data.birthDate);
   formDetail.govAge = data.govAge;
-  formDetail.educations = data.education;
+  formDetail.educations = data.educations;
 
-  formDetail.certificates = data.certificate.map((e: CertificatesForm) => ({
+  formDetail.certificates = data.certificates.map((e: CertificatesForm) => ({
     certificateNo: e.certificateNo,
     certificateType: e.certificateType,
     expireDate: date2Thai(e.expireDate),
@@ -179,7 +179,7 @@ async function fetchCheckSpec(data: any) {
     positionsAdministrative: "-",
     aspectAdministrative: "-",
   }));
-  formDetail.trainings = data.training.map((e: any) => ({
+  formDetail.trainings = data.trainings.map((e: any) => ({
     dateOrder: date2Thai(e.dateOrder),
     department: e.department,
     duration: e.duration,
@@ -191,7 +191,7 @@ async function fetchCheckSpec(data: any) {
     topic: e.topic,
     yearly: e.yearly,
   }));
-  formDetail.assessments = data.assessment;
+  formDetail.assessments = data.assessments;
 }
 
 onMounted(async () => {