diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue index 43af0c493..cd73e137b 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue @@ -64,27 +64,27 @@ const columns = ref([ { name: "position", align: "left", - label: "ตำแหน่งในสายงาน", + label: "ตำแหน่ง", sortable: true, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posType", + name: "posTypeName", align: "left", - label: "ประเภทตำเเหน่ง", + label: "กลุ่มงาน", sortable: true, - field: "posType", + field: "posTypeName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posLevel", + name: "posLevelName", align: "left", - label: "ระดับตำเเหน่ง", + label: "ระดับชั้นงาน", sortable: true, - field: "posLevel", + field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -112,11 +112,19 @@ function closeModal() { /** function เรียกรายชื่อ คนเลื่อนเงินเดือน*/ function fetchListPerson() { showLoader(); - formFilter.rootId = store.rootId; - formFilter.period = store.roundMainCode; - formFilter.year = store.roundYear; + // formFilter.rootId = store.rootId; + // formFilter.period = store.roundMainCode; + // formFilter.year = store.roundYear; + const reqBody = { + posTypeId: "", // id ประเภทตำแหน่ง + posLevelId: "", // id ระดับตำแหน่ง + position: "", // ตำแหน่ง + page: formFilter.page, //*หน้า + pageSize: formFilter.pageSize, //*จำนวนแถวต่อหน้า + keyword: formFilter.keyword, //นามสกุล ชื่อ สกุล เลขบัตร + }; http - .post(config.API.salaryListPerson, formFilter) + .post(config.API.orgSearchProfileEmp, reqBody) .then((res) => { const data = res.data.result.data; maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue index ca777ff43..8a59b40c2 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue @@ -68,38 +68,29 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "position", + name: "positionName", align: "left", - label: "ตำแหน่งในสายงาน", + label: "ตำแหน่ง", sortable: true, - field: "position", + field: "positionName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posType", + name: "posTypeName", align: "left", - label: "ตำแหน่งประเภท", + label: "กลุ่มงาน", sortable: false, - field: "posType", + field: "posTypeName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posLevel", + name: "posLevelName", align: "left", - label: "ระดับตำแหน่ง", + label: "ระดับชั้นงาน", sortable: false, - field: "posLevel", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "posExecutive", - align: "left", - label: "ตำแหน่งทางการบริหาร", - sortable: false, - field: "posExecutive", + field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -146,10 +137,9 @@ const visibleColumns = ref([ "no", "posNo", "fullName", - "position", - "posType", - "posLevel", - "posExecutive", + "positionName", + "posTypeName", + "posLevelName", "amount", "amountUse", "positionSalaryAmount", diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue index f4bc8efe0..39cf7d6e6 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue @@ -63,37 +63,28 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "posType", + name: "posTypeName", align: "left", - label: "ตำแหน่งประเภท", + label: "กลุ่มงาน", sortable: true, - field: "posType", + field: "posTypeName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posExecutive", + name: "positionName", align: "left", - label: "ตำแหน่งทางการบริหาร", - sortable: true, - field: "posExecutive", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "position", - align: "left", - label: "ตำแหน่งในสายงาน", - field: "position", + label: "ตำแหน่ง", + field: "positionName", sortable: true, headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "posLevel", + name: "posLevelName", align: "left", - label: "ระดับตำแหน่ง", - field: "posLevel", + label: "ระดับชั้นงาน", + field: "posLevelName", sortable: true, headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -174,10 +165,9 @@ const columns = ref([ const visibleColumns = ref([ "no", "fullName", - "posType", - "posExecutive", - "position", - "posLevel", + "posTypeName", + "positionName", + "posLevelName", "amount", "organization", "result", diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue index f033e8392..57ff5dda3 100644 --- a/src/modules/13_salary/views/salaryEmployeeLists.vue +++ b/src/modules/13_salary/views/salaryEmployeeLists.vue @@ -243,11 +243,6 @@ async function onChangeRound() { await getAgency(roundFilter.value.revisionId); await getAgencyPosition(roundFilter.value.revisionId); if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { - // await fetchSalalyPeriod( - // agencyFilter.value, - // roundFilter.value.id, - // snapFilter.value - // ); store.tabType = "PENDING"; store.roundMainCode = roundFilter.value.shortCode; } else {