diff --git a/src/modules/05_placement/components/PersonalDetail/DetailMain.vue b/src/modules/05_placement/components/PersonalDetail/DetailMain.vue index 4b75284f9..0e5bf0ce5 100644 --- a/src/modules/05_placement/components/PersonalDetail/DetailMain.vue +++ b/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, }); }); diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue index e672d9044..446df1a7f 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue +++ b/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) : "-" }}
- {{ col.value }} + {{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue index d9ab751de..1cd7825b1 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue +++ b/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; });