Merge branch 'develop'
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
This commit is contained in:
commit
40942fc420
2 changed files with 2 additions and 1 deletions
|
|
@ -1294,7 +1294,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
|
||||||
state.value.currentEmployee?.status === 'CREATED'
|
state.value.currentEmployee?.status === 'CREATED'
|
||||||
? 'ACTIVE'
|
? 'ACTIVE'
|
||||||
: state.value.currentEmployee?.status,
|
: state.value.currentEmployee?.status,
|
||||||
customerBranchId: state.value.formDataEmployeeOwner?.id || '',
|
customerBranchId: state.value.currentBranchId || '',
|
||||||
employeeWork: [],
|
employeeWork: [],
|
||||||
employeeCheckup: [],
|
employeeCheckup: [],
|
||||||
employeeOtherInfo: undefined,
|
employeeOtherInfo: undefined,
|
||||||
|
|
|
||||||
|
|
@ -1509,6 +1509,7 @@ function covertToNode() {
|
||||||
:quotation-status="
|
:quotation-status="
|
||||||
quotationFormState.source?.quotationStatus === 'Expired'
|
quotationFormState.source?.quotationStatus === 'Expired'
|
||||||
"
|
"
|
||||||
|
:created-at="quotationFormState.createdAt"
|
||||||
v-model:urgent="quotationFormData.urgent"
|
v-model:urgent="quotationFormData.urgent"
|
||||||
v-model:work-name="quotationFormData.workName"
|
v-model:work-name="quotationFormData.workName"
|
||||||
v-model:contactor="quotationFormData.contactName"
|
v-model:contactor="quotationFormData.contactName"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue