diff --git a/src/components/DialogDuplicateData.vue b/src/components/DialogDuplicateData.vue index 58931e12..97530a35 100644 --- a/src/components/DialogDuplicateData.vue +++ b/src/components/DialogDuplicateData.vue @@ -37,6 +37,7 @@ onMounted(() => { " :close=" () => { + cancel?.(); modal = false; } " diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue index ce2ea25b..5a143de3 100644 --- a/src/pages/05_quotation/QuotationForm.vue +++ b/src/pages/05_quotation/QuotationForm.vue @@ -375,6 +375,7 @@ async function getAllService( function triggerCreateEmployee() { employeeFormStore.resetFormDataEmployee(true); + setDefaultFormEmployee(); employeeFormState.value.dialogType = 'create'; employeeFormState.value.dialogModal = true; employeeFormState.value.isEmployeeEdit = true; @@ -1177,7 +1178,17 @@ watch( checkData: () => { return tempValue; }, - cancel: () => {}, + cancel: () => { + if (!formDataEmployee.firstName) { + formDataEmployee.firstName = fullName[0]; + } + if (!formDataEmployee.lastName) { + formDataEmployee.lastName = fullName[1]; + } + if (!formDataEmployee.passportNo) { + formDataEmployee.passportNo = allMeta['doc_number']; + } + }, }); } }