diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue index 3e253c831..b2081e488 100644 --- a/src/modules/21_report/views/02_reportRegistry.vue +++ b/src/modules/21_report/views/02_reportRegistry.vue @@ -139,7 +139,7 @@ const visibleColumnsBase = ref([ "age", "positionDate", "levelDate", - "posExecutive", + "posExecutiveDate", ]); const columns = computed(() => { @@ -362,11 +362,11 @@ const columns = computed(() => { a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "posExecutive", + name: "posExecutiveDate", align: "left", label: "ระยะเวลาดำรงตำแหน่ง (บริหาร) ปัจจุบัน", sortable: true, - field: "posExecutive", + field: "posExecutiveDate", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -620,9 +620,15 @@ async function onSearch() { ) ?? "-", levelDate: formatDatePositionReport( - item.levelDate?.posExecutiveYears, - item.levelDate?.posExecutiveMonths, - item.levelDate?.posExecutiveDays + item.levelDate?.Years, + item.levelDate?.Months, + item.levelDate?.Days + ) ?? "-", + posExecutiveDate: + formatDatePositionReport( + item.posExecutiveDate?.Years, + item.posExecutiveDate?.Months, + item.posExecutiveDate?.Days ) ?? "-", empType: employeeClass.value, dateRetireLaw: item.dateRetireLaw ?? "-",