diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue index 2b710dd65..5b6631117 100644 --- a/src/modules/13_salary/views/salaryEmployeeRate.vue +++ b/src/modules/13_salary/views/salaryEmployeeRate.vue @@ -107,15 +107,18 @@ const pagination = ref({ rowsPerPage: formFilter.pageSize, }); const isActive = ref(false); +const group = ref(""); function fetchDataDetail() { http .get(config.API.salaryEmployeeChartByid(salaryEmployeeId.value)) .then((res) => { isActive.value = res.data.result.isActive; + group.value = `กลุ่มที่ ${res.data.result.group}`; }) - .catch((e) => {}) - .finally(() => {}); + .catch((e) => { + messageError($q, e); + }); } function fetchSalalyEmployeeRate() { @@ -240,7 +243,7 @@ onMounted(() => { class="q-mr-sm" @click="router.go(-1)" /> - อัตราค่าจ้าง + อัตราค่าจ้าง {{ group }} diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue index f83272217..eeaf18461 100644 --- a/src/modules/13_salary/views/salaryRate.vue +++ b/src/modules/13_salary/views/salaryRate.vue @@ -34,6 +34,8 @@ const { } = useCounterMixin(); const isActive = ref(false); +const posType = ref(""); + const salaryId = ref(route.params.id.toString()); /** modalDialog*/ @@ -209,9 +211,11 @@ function fetchList() { .get(config.API.salaryChartByid(salaryId.value)) .then((res) => { isActive.value = res.data.result.isActive; + posType.value = `${res.data.result.posTypeName}(${res.data.result.posLevelName})`; }) - .catch((e) => {}) - .finally(() => {}); + .catch((e) => { + messageError($q, e); + }); } onMounted(async () => { await fetchList(); @@ -236,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => { class="q-mr-sm" @click="router.go(-1)" /> - อัตราเงินเดือน + อัตราเงินเดือน {{ posType }}