diff --git a/src/modules/13_salary/store/SalaryStore.ts b/src/modules/13_salary/store/SalaryStore.ts index 6419b9783..2e71a4cfb 100644 --- a/src/modules/13_salary/store/SalaryStore.ts +++ b/src/modules/13_salary/store/SalaryStore.ts @@ -16,7 +16,7 @@ export const useSalaryDataStore = defineStore("salaryDataStore", () => { function fetchDataMap(data: RowList[]) { rows.value = data.map((i: RowList) => ({ id: i.id, - period: i.period !== null ? statusTothai(i.period) : null, + period: i.period !== null ? i.period : null, isActive: i.isActive !== null ? i.isActive : null, effectiveDate: i.effectiveDate !== null ? i.effectiveDate : null, status: i.status !== null ? i.status : null, @@ -44,6 +44,7 @@ export const useSalaryDataStore = defineStore("salaryDataStore", () => { rows, visibleColumns, columns, - fetchDataMap + fetchDataMap, + statusTothai }; }); diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue index 29b49b556..94d38b95a 100644 --- a/src/modules/13_salary/views/salaryRound.vue +++ b/src/modules/13_salary/views/salaryRound.vue @@ -314,6 +314,9 @@ onMounted(async () => {