แก้ไข

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
   };
 });

src/modules/13_salary/views/salaryRound.vue

@@ -314,6 +314,9 @@ onMounted(async () => {
               <div v-if="col.name == 'effectiveDate'">
                 {{ date2Thai(props.row.effectiveDate)}}
               </div>
+              <div v-else-if="col.name == 'period'">
+                {{ dataStore.statusTothai(props.row.period)}}
+              </div>
               <div v-else-if="col.name === 'isActive'">
                 <q-icon
                   v-if="col.value == false"