diff --git a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue index d834147cb..af76b281b 100644 --- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue +++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue @@ -34,7 +34,7 @@ const profileId = ref(route.params.id.toString()); /** * props */ - const isLeave = defineModel("isLeave", { +const isLeave = defineModel("isLeave", { required: true, }); @@ -96,9 +96,9 @@ const formData = reactive({ }); /** function fetch ข้อมูลรายการการจ้าง*/ -function fetchListEmployment() { +async function fetchListEmployment() { showLoader(); - http + await http .get(config.API.employmentEmployee(profileId.value)) .then((res) => { const data = res.data.result; @@ -170,10 +170,9 @@ function onSubmit() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { hideLoader(); - }); + }) + .finally(() => {}); }); } @@ -275,7 +274,6 @@ onMounted(() => { map-options :options="columns?.slice(0, 2)" option-value="name" - style="min-width: 140px" /> @@ -474,7 +472,6 @@ onMounted(() => { map-options :options="columns" option-value="name" - style="min-width: 140px" /> diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index b6e2629f6..62ca30766 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -217,9 +217,9 @@ const docOption = ref(store.optionTemplateDoc); /** * function fetch รายการ ตำแหน่งเงินเดือน */ -function fetchListSalary() { +async function fetchListSalary() { showLoader(); - http + await http .get(config.API.profileListSalaryNew(profileId.value, empType.value)) .then((res) => { rows.value = res.data.result; @@ -448,13 +448,13 @@ function onSubmit() { : config.API.profileSalaryNew(empType.value); const method = isStatusEdit.value ? "patch" : "post"; await http[method](url, formData); + await onClickCloseDialog(); await fetchListSalary(); success($q, "บันทึกข้อมูลสำเร็จ"); - await onClickCloseDialog(); } catch (e) { messageError($q, e); + hideLoader() } finally { - hideLoader(); } }); }