From 7f56a6219aed15d579e85f40a5fe97cddc9f2f71 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Tue, 15 Jul 2025 14:31:53 +0700 Subject: [PATCH] fix: edit debit note with new employee --- .../03_customer-management/employee/BasicInformation.vue | 2 +- src/pages/12_debit-note/FormPage.vue | 8 ++++---- src/pages/12_debit-note/expansion/WorkerItemExpansion.vue | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/03_customer-management/employee/BasicInformation.vue b/src/components/03_customer-management/employee/BasicInformation.vue index e319f785..7c3dcb55 100644 --- a/src/components/03_customer-management/employee/BasicInformation.vue +++ b/src/components/03_customer-management/employee/BasicInformation.vue @@ -127,7 +127,7 @@ defineEmits<{ simple required :readonly - :disabled="disableCustomerSelect" + :disabled="disableCustomerSelect && !readonly" /> { 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; }), ]), ), diff --git a/src/pages/12_debit-note/expansion/WorkerItemExpansion.vue b/src/pages/12_debit-note/expansion/WorkerItemExpansion.vue index 16cd4c07..d0ad1200 100644 --- a/src/pages/12_debit-note/expansion/WorkerItemExpansion.vue +++ b/src/pages/12_debit-note/expansion/WorkerItemExpansion.vue @@ -49,8 +49,8 @@ const toggleWorker = defineModel('toggleWorker'); {{ $t('quotation.employeeList') }}