Merge branch 'develop' into dev

* develop:
  fix
  fix
This commit is contained in:
Warunee Tamkoo 2025-11-26 15:48:07 +07:00
commit 0df3325c6a

View file

@ -363,10 +363,9 @@ const saveData = async () => {
.then(async () => { .then(async () => {
if (!props.stepPayment) { if (!props.stepPayment) {
secondDialog.value = true secondDialog.value = true
} else {
success($q, 'บันทึกข้อมูลส่วนตัวสำเร็จ')
} }
// else {
// success($q, '')
// }
await saveForm() await saveForm()
await props.fetchStep() await props.fetchStep()
dialog.value = false dialog.value = false
@ -434,7 +433,7 @@ const saveData = async () => {
contacttel: defaultContact.value.contacttel contacttel: defaultContact.value.contacttel
}) })
.then(async () => { .then(async () => {
success($q, 'บันทึกข้อมูลส่วนตัวสำเร็จ') !secondDialog.value && success($q, 'บันทึกข้อมูลส่วนตัวสำเร็จ')
await props.fetchStep() await props.fetchStep()
}) })
.catch((e) => { .catch((e) => {
@ -449,6 +448,7 @@ async function onSubmit() {
saveAuto.value = false saveAuto.value = false
await saveData() await saveData()
await http.post(config.API.registerConfirm(examId.value, positionId.value)) await http.post(config.API.registerConfirm(examId.value, positionId.value))
success($q, 'ส่งใบสมัครสำเร็จ')
await props.fetchStep() await props.fetchStep()
// do something // do something
} catch (error) { } catch (error) {