ปรับ ประเมินบุคคล

src/modules/06_evaluate/components/EvaluateStepMain.vue

@@ -281,6 +281,17 @@ async function saveStep1() {
     other: e.other,
     startDate: e.startDate,
   }));
+
+  const assessments = formDetail.value.assessments.map((e: any) => ({
+    date: e.date,
+    point1: e.point1,
+    point1Total: e.point1Total,
+    point2: e.point2,
+    point2Total: e.point2Total,
+    pointSum: e.pointSum,
+    pointSumTotal: e.pointSumTotal,
+  }));
+
   const evaluateType = route.params.type.toString();
   const form = {
     userId: formDetail.value.id,
@@ -308,7 +319,7 @@ async function saveStep1() {
     certificates: [...formDetail.value.certificates],
     salaries: [...salaries],
     trainings: [...formDetail.value.trainings],
-    assessments: [...formDetail.value.assessments],
+    assessments: [...assessments],
   };
 
   await http

src/modules/06_evaluate/components/viewstep/viewStep1.vue

@@ -28,6 +28,7 @@ const {
   columnSalaries,
   columnTraining,
   columnProjectsProposed,
+  columnAssessments,
 } = store;
 
 const props = defineProps({
@@ -125,16 +126,17 @@ async function fetchDetail() {
         }));
       });
 
-      http.get(config.API.dataUserHonor).then((res) => {
-        formDetail.honor = res.data.result.map((e: any) => ({
-          receivedDate: e.createdAt,
-          authority: e.issuer,
-          detail: e.detail,
-          orderNumber: e.refCommandNo,
-          doce: e.refCommandDate,
-        }));
+      http.get(config.API.dataUserAssessments).then((res) => {
+        // formDetail.honor =  res.data.result
+        //  res.data.result.map((e: any) => ({
+        //   receivedDate: e.createdAt,
+        //   authority: e.issuer,
+        //   detail: e.detail,
+        //   orderNumber: e.refCommandNo,
+        //   doce: e.refCommandDate,
+        formDetail.assessments = res.data.result;
       });
-      // formDetail.assessments = data.assessments;
+      // }));
       emit("update:formDeital", formDetail);
     })
     .catch((err) => {
@@ -578,8 +580,8 @@ onMounted(async () => {
         <div class="col-12"><q-separator /></div>
         <div class="col-10">
           <TableData
-            :columns="columnProjectsProposed"
-            :row="formDetail.honor"
+            :columns="columnAssessments"
+            :row="formDetail.assessments"
           />
         </div>
       </q-card>