diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue index 7752d284c..59db59ad3 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue @@ -109,7 +109,11 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-"; + return row.posNoAbb && row.posNo + ? `${row.posNoAbb}${row.posNo}` + : row.posNo + ? row.posNo + : "-"; }, }, { diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue index 4a6ae75ac..a8311ede0 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue @@ -100,7 +100,11 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-"; + return row.posNoAbb && row.posNo + ? `${row.posNoAbb}${row.posNo}` + : row.posNo + ? row.posNo + : "-"; }, }, { diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 847b8a74b..fab4a6c31 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -109,7 +109,11 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-"; + return row.posNoAbb && row.posNo + ? `${row.posNoAbb}${row.posNo}` + : row.posNo + ? row.posNo + : "-"; }, }, { diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue index fb132f16a..383c3305a 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue @@ -100,7 +100,11 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-"; + return row.posNoAbb && row.posNo + ? `${row.posNoAbb}${row.posNo}` + : row.posNo + ? row.posNo + : "-"; }, }, {