hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-30 17:30:32 +07:00
commit b653300188
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
View file

@ -117,7 +117,7 @@ const baseColumns = ref<QTableColumn[]>([
field: "insigniaId",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (v) => store.allNameInsignia.find((r) => r.id === v)?.name,
format: (v) => store.allNameInsignia.find((r) => r.id === v)?.name ?? "-",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
@ -128,7 +128,7 @@ const baseColumns = ref<QTableColumn[]>([
sortable: true,
field: "insigniaType",
format(val, row) {
return row.insignia.insigniaType.name;
return row.insignia ? row.insignia.insigniaType.name : "-";
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",