fix bug display data report registry
This commit is contained in:
parent
d76686caba
commit
2ae10162ae
1 changed files with 12 additions and 6 deletions
|
|
@ -139,7 +139,7 @@ const visibleColumnsBase = ref<string[]>([
|
||||||
"age",
|
"age",
|
||||||
"positionDate",
|
"positionDate",
|
||||||
"levelDate",
|
"levelDate",
|
||||||
"posExecutive",
|
"posExecutiveDate",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const columns = computed<QTableProps["columns"]>(() => {
|
const columns = computed<QTableProps["columns"]>(() => {
|
||||||
|
|
@ -362,11 +362,11 @@ const columns = computed<QTableProps["columns"]>(() => {
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "posExecutive",
|
name: "posExecutiveDate",
|
||||||
align: "left",
|
align: "left",
|
||||||
label: "ระยะเวลาดำรงตำแหน่ง (บริหาร) ปัจจุบัน",
|
label: "ระยะเวลาดำรงตำแหน่ง (บริหาร) ปัจจุบัน",
|
||||||
sortable: true,
|
sortable: true,
|
||||||
field: "posExecutive",
|
field: "posExecutiveDate",
|
||||||
headerStyle: "font-size: 14px",
|
headerStyle: "font-size: 14px",
|
||||||
style: "font-size: 14px",
|
style: "font-size: 14px",
|
||||||
sort: (a: string, b: string) =>
|
sort: (a: string, b: string) =>
|
||||||
|
|
@ -620,9 +620,15 @@ async function onSearch() {
|
||||||
) ?? "-",
|
) ?? "-",
|
||||||
levelDate:
|
levelDate:
|
||||||
formatDatePositionReport(
|
formatDatePositionReport(
|
||||||
item.levelDate?.posExecutiveYears,
|
item.levelDate?.Years,
|
||||||
item.levelDate?.posExecutiveMonths,
|
item.levelDate?.Months,
|
||||||
item.levelDate?.posExecutiveDays
|
item.levelDate?.Days
|
||||||
|
) ?? "-",
|
||||||
|
posExecutiveDate:
|
||||||
|
formatDatePositionReport(
|
||||||
|
item.posExecutiveDate?.Years,
|
||||||
|
item.posExecutiveDate?.Months,
|
||||||
|
item.posExecutiveDate?.Days
|
||||||
) ?? "-",
|
) ?? "-",
|
||||||
empType: employeeClass.value,
|
empType: employeeClass.value,
|
||||||
dateRetireLaw: item.dateRetireLaw ?? "-",
|
dateRetireLaw: item.dateRetireLaw ?? "-",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue