diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 237c3ff9c..4592a32f1 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -110,7 +110,8 @@ const columns = ref([ sortable: true, field: "organization", headerStyle: "font-size: 14px", - style: "font-size: 14px", + style: "font-size: 14px ", + classes: "table_ellipsis", }, { name: "probation_no", @@ -179,7 +180,10 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.posTypeName + " (" + row.posLevelName + ")"; + return ( + (row.posTypeName ? row.posTypeName : "") + + (row.posLevelName !== null ? " (" + row.posLevelName + ")" : "") + ); }, }, { @@ -250,7 +254,7 @@ async function getpersonalList() { position_line_id: item.position_line_id, position_level: item.position_level, position_level_id: item.position_level_id, - organization: item.organization, + organization: item.organization !== "" ? item.organization : "-", probation_no: item.probation_no, order_number: item.order_number != "xx/2566" ? item.order_number : "-", probation_status: statusProbationMain(Number(item.probation_status)), @@ -382,9 +386,7 @@ function clickAdd(data: any) { $q, async () => { showLoader(); - // const postData = { - // personal_id: id, - // }; + await http .post(config.API.personalAdd(), data) .then(() => { @@ -582,7 +584,7 @@ onMounted(async () => { {{ props.rowIndex + 1 }}
- {{ col.value }} + {{ col.value ?? "-" }}
@@ -680,7 +682,7 @@ onMounted(async () => {
{{ - props.row.prefix + + (props.row.prefix ? props.row.prefix : "") + props.row.firstName + " " + props.row.lastName