diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 0d48df7f3..a8585fb26 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -375,7 +375,9 @@ async function fetchDataPersonal() { res.data.result.leaveReason !== null && res.data.result.leaveReason !== "" ) { - leaveReason.value = `(พ้นจากราชการ : ${storeRegistry.convertTypeRetired(res.data.result.leaveType)})`; + leaveReason.value = `(พ้นจากราชการ : ${storeRegistry.convertTypeRetired( + res.data.result.leaveType + )})`; } reasonStatus.value = reason.length > 0 ? true : false; } @@ -439,8 +441,8 @@ function helpPost() { await http .post(config.API.placemenHelpGov, formData) .then(async () => { - await router.push("/placement/help-government"); await success($q, "ดำเนินการสำเร็จ"); + router.push("/placement/help-government"); }) .catch((e) => { messageError($q, e); @@ -460,8 +462,8 @@ function repatriationPost() { await http .post(config.API.placemenRepatriation, formData) .then(async () => { - await router.push("/placement/repatriate"); await success($q, "ดำเนินการสำเร็จ"); + router.push("/placement/repatriate"); }) .catch((e) => { messageError($q, e); @@ -481,8 +483,8 @@ function appointPost() { await http .post(config.API.placemenAppointment, formData) .then(async () => { - await router.push("/placement/appoint-promote"); await success($q, "ดำเนินการสำเร็จ"); + router.push("/placement/appoint-promote"); }) .catch((e) => { messageError($q, e); @@ -516,14 +518,14 @@ function outPost() { await http .post(config.API.retirementOut, formData) .then(async () => { - await router.push( + await success($q, "ดำเนินการสำเร็จ"); + router.push( `${ empType.value === "-employee" ? `/retirementEmployee` : `/retirement/dismiss-order` }` ); - await success($q, "ดำเนินการสำเร็จ"); }) .catch((e) => { messageError($q, e); @@ -547,8 +549,8 @@ function otherPost() { await http .post(config.API.placemenOther, formData) .then(async () => { - await router.push("/placement/other"); await success($q, "ดำเนินการสำเร็จ"); + router.push("/placement/other"); }) .catch((e) => { messageError($q, e); @@ -568,8 +570,8 @@ function appointEmployeePost() { await http .post(config.API.appointEmployee(), formData) .then(async () => { - await router.push("/placement/appoint-employee"); await success($q, "ดำเนินการสำเร็จ"); + router.push("/placement/appoint-employee"); }) .catch((e) => { messageError($q, e); @@ -599,8 +601,8 @@ function clickSaveDeceased() { await http .post(config.API.listDeceased(), formData) .then(async () => { - await router.push("/retirement/deceased"); await success($q, "บันทึกข้อมูลสำเร็จ"); + router.push("/retirement/deceased"); }) .catch((e) => { messageError($q, e);