Merge branch 'nice' into develop
This commit is contained in:
commit
d350e70e80
1 changed files with 4 additions and 4 deletions
|
|
@ -220,8 +220,8 @@ async function postData(action: string) {
|
|||
pass_result: result.value,
|
||||
reson: reson.value,
|
||||
chairman_dated: chairman_dated.value,
|
||||
director1_dated: director1_dated.value,
|
||||
director2_dated: director2_dated.value,
|
||||
director1_dated: director1_dated.value ? director1_dated.value : new Date(),
|
||||
director2_dated: director2_dated.value ? director2_dated.value : new Date(),
|
||||
expand_month: expand_month.value ? expand_month.value : undefined,
|
||||
evaluate_no: props?.tab ? Number(props?.tab.charAt(4)) : undefined,
|
||||
};
|
||||
|
|
@ -233,12 +233,12 @@ async function postData(action: string) {
|
|||
success($q, "บันทึกสำเร็จ");
|
||||
fecthResult(assignId.value);
|
||||
router.push(`/probation/detail/${personalId.value}/${assignId.value}`);
|
||||
status.value = false;
|
||||
})
|
||||
.catch((e: any) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
status.value = false;
|
||||
hideLoader();
|
||||
});
|
||||
} else if (action === "put") {
|
||||
|
|
@ -248,13 +248,13 @@ async function postData(action: string) {
|
|||
.then(() => {
|
||||
success($q, "บันทึกสำเร็จ");
|
||||
fecthResult(assignId.value);
|
||||
status.value = false;
|
||||
router.push(`/probation/detail/${personalId.value}/${assignId.value}`);
|
||||
})
|
||||
.catch((e: any) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
status.value = false;
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue