Merge branch 'develop'
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s

This commit is contained in:
Thanaphon Frappet 2025-06-11 10:24:48 +07:00
commit 40942fc420
2 changed files with 2 additions and 1 deletions

View file

@ -1294,7 +1294,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
state.value.currentEmployee?.status === 'CREATED'
? 'ACTIVE'
: state.value.currentEmployee?.status,
customerBranchId: state.value.formDataEmployeeOwner?.id || '',
customerBranchId: state.value.currentBranchId || '',
employeeWork: [],
employeeCheckup: [],
employeeOtherInfo: undefined,

View file

@ -1509,6 +1509,7 @@ function covertToNode() {
:quotation-status="
quotationFormState.source?.quotationStatus === 'Expired'
"
:created-at="quotationFormState.createdAt"
v-model:urgent="quotationFormData.urgent"
v-model:work-name="quotationFormData.workName"
v-model:contactor="quotationFormData.contactName"