chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: edit debit note with new employee
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 5s
Details

Browse source
This commit is contained in:
puriphatt 2025-07-15 14:31:53 +07:00
parent 642dec8de9
commit 7f56a6219a
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/03_customer-management/employee/BasicInformation.vue
View file

@ -127,7 +127,7 @@ defineEmits<{
simple simple
required required
:readonly :readonly
:disabled="disableCustomerSelect" :disabled="disableCustomerSelect && !readonly"
/> />
<q-input <q-input

8
src/pages/12_debit-note/FormPage.vue
View file

@ -218,7 +218,7 @@ const selectedWorkerItem = computed(() => {
employeeName: employeeName:
locale.value === Lang.English locale.value === Lang.English
? `${e.firstNameEN} ${e.lastNameEN}` ? `${e.firstNameEN} ${e.lastNameEN}`
: `${e.firstName} ${e.lastName}`, : `${e.firstName || e.firstNameEN} ${e.lastName || e.lastNameEN}`,
birthDate: dateFormatJS({ date: e.dateOfBirth }), birthDate: dateFormatJS({ date: e.dateOfBirth }),
gender: e.gender, gender: e.gender,
age: calculateAge(e.dateOfBirth), age: calculateAge(e.dateOfBirth),
@ -235,11 +235,11 @@ const selectedWorkerItem = computed(() => {
})), })),
...newWorkerList.value.map((v: any) => ({ ...newWorkerList.value.map((v: any) => ({
foreignRefNo: v.passportNo, foreignRefNo: v.passportNo || '-',
employeeName: employeeName:
locale.value === Lang.English locale.value === Lang.English
? `${v.firstNameEN} ${v.lastNameEN}` ? `${v.firstNameEN} ${v.lastNameEN}`
: `${v.firstName} ${v.lastName}`, : `${v.firstName || v.firstNameEN} ${v.lastName || v.lastNameEN}`,
birthDate: dateFormatJS({ date: v.dateOfBirth }), birthDate: dateFormatJS({ date: v.dateOfBirth }),
gender: v.gender, gender: v.gender,
age: calculateAge(v.dateOfBirth), age: calculateAge(v.dateOfBirth),
@ -815,7 +815,7 @@ async function submit() {
}), }),
...newWorkerList.value.map((v) => { ...newWorkerList.value.map((v) => {
const { attachment, ...payload } = v; const { attachment, ...payload } = v;
return payload; return pageState.mode === 'edit' ? payload.id : payload;
}), }),
]), ]),
), ),

4
src/pages/12_debit-note/expansion/WorkerItemExpansion.vue
View file

@ -49,8 +49,8 @@ const toggleWorker = defineModel<boolean>('toggleWorker');
{{ $t('quotation.employeeList') }} {{ $t('quotation.employeeList') }}
</span> </span>
<template v-if="!readonly"> <template v-if="!readonly">
<ToggleButton class="q-mr-sm" v-model="toggleWorker" /> <!-- <ToggleButton class="q-mr-sm" v-model="toggleWorker" />
{{ toggleWorker ? $t('general.specify') : $t('general.noSpecify') }} {{ toggleWorker ? $t('general.specify') : $t('general.noSpecify') }} -->
</template> </template>
</div> </div>
<nav class="q-ml-auto"> <nav class="q-ml-auto">