Merge branch 'nice_dev' into develop

2024-02-20 18:03:05 +07:00 · 2024-02-20 18:03:05 +07:00 · c23af7ec9b
commit c23af7ec9b
parent fad464a051 1427746276
1 changed files with 3 additions and 0 deletions
--- a/src/modules/13_salary/views/salaryChart.vue
+++ b/src/modules/13_salary/views/salaryChart.vue
@ -303,6 +303,9 @@ async function filterFn(page: number) {
              <div v-else-if="col.name === 'startDate'">
                {{ col.value ? date2Thai(col.value) : "-" }}
              </div>
+              <div v-else-if="col.name === 'posLevel'">
+                {{ props.row.isSpecial ? `${col.value} (ฉ)` : `${col.value}` }}
+              </div>
              <div v-else>
                {{ col.value ? col.value : "-" }}
              </div>