diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue index c8433c11c..b92c37b45 100644 --- a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue +++ b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue @@ -200,7 +200,7 @@ function getData() { rateOldMin: item.salaryMin, groupOld: item.salaryEmployeeMin.sort((a, b) => a - b), rateMaxOld: item.salary, - groupRateHigh: item.group, + groupRateHigh: `กลุ่มที่ ${item.group}`, rateHighMax: item.salaryMax, reson: item.details, })); @@ -270,7 +270,6 @@ function onClickDelete(id: string) { */ function filterSelector(val: string, update: Function) { update(() => { - posType.value = null; posTypeOp.value = posTypeOpMain.value.filter( (v: DataOption) => v.name.toLowerCase().indexOf(val) > -1 ); @@ -375,7 +374,6 @@ onMounted(async () => { map-options :options="columns" option-value="name" - style="min-width: 140px" class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" /> @@ -390,7 +388,7 @@ onMounted(async () => { row-key="name" class="custom-header-table" v-model:pagination="pagination" - :rows-per-page-options="[20, 50, 100, 200]" + :rows-per-page-options="[10, 20, 50, 100]" :visible-columns="visibleColumns" @update:pagination="updatePageSize" > @@ -463,7 +461,8 @@ onMounted(async () => {
- {{ item }}{{ index + 1 == col.value.length ? "" : "," }} + {{ item ? `กลุ่มที่ ${item}` : "" + }}{{ index + 1 == col.value.length ? "" : "," }}
{{ col.value != "" ? col.value : "-" }}