fix: edit debit note with new employee
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 5s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 5s
This commit is contained in:
parent
642dec8de9
commit
7f56a6219a
3 changed files with 7 additions and 7 deletions
|
|
@ -127,7 +127,7 @@ defineEmits<{
|
|||
simple
|
||||
required
|
||||
:readonly
|
||||
:disabled="disableCustomerSelect"
|
||||
:disabled="disableCustomerSelect && !readonly"
|
||||
/>
|
||||
|
||||
<q-input
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ const selectedWorkerItem = computed(() => {
|
|||
employeeName:
|
||||
locale.value === Lang.English
|
||||
? `${e.firstNameEN} ${e.lastNameEN}`
|
||||
: `${e.firstName} ${e.lastName}`,
|
||||
: `${e.firstName || e.firstNameEN} ${e.lastName || e.lastNameEN}`,
|
||||
birthDate: dateFormatJS({ date: e.dateOfBirth }),
|
||||
gender: e.gender,
|
||||
age: calculateAge(e.dateOfBirth),
|
||||
|
|
@ -235,11 +235,11 @@ const selectedWorkerItem = computed(() => {
|
|||
})),
|
||||
|
||||
...newWorkerList.value.map((v: any) => ({
|
||||
foreignRefNo: v.passportNo,
|
||||
foreignRefNo: v.passportNo || '-',
|
||||
employeeName:
|
||||
locale.value === Lang.English
|
||||
? `${v.firstNameEN} ${v.lastNameEN}`
|
||||
: `${v.firstName} ${v.lastName}`,
|
||||
: `${v.firstName || v.firstNameEN} ${v.lastName || v.lastNameEN}`,
|
||||
birthDate: dateFormatJS({ date: v.dateOfBirth }),
|
||||
gender: v.gender,
|
||||
age: calculateAge(v.dateOfBirth),
|
||||
|
|
@ -815,7 +815,7 @@ async function submit() {
|
|||
}),
|
||||
...newWorkerList.value.map((v) => {
|
||||
const { attachment, ...payload } = v;
|
||||
return payload;
|
||||
return pageState.mode === 'edit' ? payload.id : payload;
|
||||
}),
|
||||
]),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ const toggleWorker = defineModel<boolean>('toggleWorker');
|
|||
{{ $t('quotation.employeeList') }}
|
||||
</span>
|
||||
<template v-if="!readonly">
|
||||
<ToggleButton class="q-mr-sm" v-model="toggleWorker" />
|
||||
{{ toggleWorker ? $t('general.specify') : $t('general.noSpecify') }}
|
||||
<!-- <ToggleButton class="q-mr-sm" v-model="toggleWorker" />
|
||||
{{ toggleWorker ? $t('general.specify') : $t('general.noSpecify') }} -->
|
||||
</template>
|
||||
</div>
|
||||
<nav class="q-ml-auto">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue