fix ประวัติการศึกษาบรรจุ

src/modules/05_placement/components/PersonalDetail/DetailMain.vue

@@ -224,22 +224,22 @@ async function fetchData() {
       data.education.map((row: any) => {
         listRow.push({
           id: guidCheck(row.id) ?? "",
-          educationLevel: row.educationLevel ?? "",
-          educationLevelId: guidCheck(row.educationLevelId) ?? "",
-          institute: row.institute ?? "",
-          degree: row.degree ?? "",
-          field: row.field ?? "",
-          gpa: row.gpa ?? "",
-          country: row.country ?? "",
-          duration: row.duration ?? "",
-          other: row.other ?? "",
-          fundName: row.fundName ?? "",
+          educationLevel: row.educationLevel ?? "-",
+          educationLevelId: guidCheck(row.educationLevelId) ?? "-",
+          institute: row.institute ?? "-",
+          degree: row.degree ?? "-",
+          field: row.field ?? "-",
+          gpa: row.gpa ?? "-",
+          country: row.country ?? "-",
+          duration: row.duration ?? "-",
+          other: row.other ?? "-",
+          fundName: row.fundName ?? "-",
           durationYear: row.durationYear ?? 0,
           finishDate: row.finishDate ?? new Date(),
           isDate: row.isDate ? "true" : "false",
-          startDate: row.startDate ? new Date(row.startDate) : new Date(),
-          endDate: row.endDate ? new Date(row.endDate) : new Date(),
-          positionPath: row.positionPath ?? "",
+          startDate: row.startDate ? new Date(row.startDate) : "",
+          endDate: row.endDate ? new Date(row.endDate) : "",
+          positionPath: row.positionPath ?? "-",
           isEducation: row.isEducation ? true : false,
         });
       });

src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue

@@ -544,10 +544,10 @@ onMounted(() => {
                 v-if="col.name == 'issueDate' || col.name == 'expireDate'"
                 class="table_ellipsis"
               >
-                {{ date2Thai(col.value) }}
+                {{ col.value ? date2Thai(col.value) : "-" }}
               </div>
               <div v-else class="table_ellipsis">
-                {{ col.value }}
+                {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
           </q-tr>

src/modules/05_placement/components/PersonalDetail/Information/Education.vue

@@ -696,7 +696,9 @@ watch(visibleColumns, (count: String[], prevCount: String[]) => {
 onMounted(async () => {
   await fetchLevel();
   await fetchPositionPath();
+
   rows.value = props.data;
+  rowsData.value = props.data;
 });
 </script>
 <template>
@@ -729,15 +731,19 @@ onMounted(async () => {
               >
                 {{
                   props.row.isDate == "true"
-                    ? date2Thai(col.value)
-                    : new Date(col.value).getFullYear() + 543
+                    ? col.value
+                      ? date2Thai(col.value)
+                      : "-"
+                    : col.value
+                    ? new Date(col.value).getFullYear() + 543
+                    : "-"
                 }}
               </div>
               <div v-else-if="col.name == 'finishDate'" class="table_ellipsis">
-                {{ date2Thai(col.value) }}
+                {{ col.value ? date2Thai(col.value) : "-" }}
               </div>
               <div v-else class="table_ellipsis">
-                {{ col.value }}
+                {{ col.value ?? "-" }}
               </div>
             </q-td>
             <!-- <q-td auto-width>

src/modules/05_placement/interface/index/Main.ts

@@ -107,8 +107,8 @@ interface Education {
   durationYear: number;
   finishDate: Date;
   isDate: string;
-  startDate: Date;
-  endDate: Date;
+  startDate: Date | string;
+  endDate: Date | string;
   positionPath: string;
   isEducation: boolean;
 }