diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue index 79dcd7098..3985213bb 100644 --- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue @@ -38,7 +38,7 @@ const columns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -74,7 +74,7 @@ const columns = ref([ name: "posType", align: "left", label: "ประเภทตำเเหน่ง", - sortable: false, + sortable: true, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -83,7 +83,7 @@ const columns = ref([ name: "posLevel", align: "left", label: "ระดับตำเเหน่ง", - sortable: false, + sortable: true, field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue index 887634fd9..375ec6d3a 100644 --- a/src/modules/13_salary/views/salaryRate.vue +++ b/src/modules/13_salary/views/salaryRate.vue @@ -54,7 +54,7 @@ const columns = ref([ name: "salary", align: "left", label: "เงินเดือนฐาน", - sortable: true, + sortable: false, field: "salary", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -63,6 +63,7 @@ const columns = ref([ name: "salaryHalf", align: "left", label: "เลื่อน 0.5 ขั้น/(พิเศษ)", + sortable: false, field: "salaryHalf", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -71,7 +72,7 @@ const columns = ref([ name: "salaryFull", align: "left", label: "เลื่อน 1 ขั้น/(พิเศษ)", - sortable: true, + sortable: false, field: "salaryFull", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -80,7 +81,7 @@ const columns = ref([ name: "salaryFullHalf", align: "left", label: "เลื่อน 1.5 ขั้น/(พิเศษ)", - sortable: true, + sortable: false, field: "salaryFullHalf", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -89,7 +90,7 @@ const columns = ref([ name: "isNext", align: "left", label: "ทะลุขั้น", - sortable: true, + sortable: false, field: "isNext", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -116,7 +117,7 @@ const itemMenu = ref([ /** queryString*/ const formQuery = reactive({ page: 1, //*หน้า - pageSize: 10, //*จำนวนแถวต่อหน้า + pageSize: 100, //*จำนวนแถวต่อหน้า keyword: "", //keyword ค้นหา }); const totalRow = ref(1); @@ -144,6 +145,11 @@ async function fetchListSalalyRate() { }); } +/** ตั้งค่าเริ่มต้น paging */ +const pagination = ref({ + page: 1, + rowsPerPage: 100, +}); /** * function updatePagination * @param newPagination ข้อมูล Pagination ใหม่ @@ -253,8 +259,9 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => { bordered :paging="true" dense - :rows-per-page-options="[10, 25, 50, 100]" + :rows-per-page-options="[10, 25, 50, 100, 500]" @update:pagination="updatePagination" + v-model:pagination="pagination" >