hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-07-09 13:54:37 +07:00
commit d6c884dc2f
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/04_registryPerson/views/detailView.vue
View file

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