diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue index 3322cf0d..66202058 100644 --- a/src/pages/05_quotation/QuotationForm.vue +++ b/src/pages/05_quotation/QuotationForm.vue @@ -1865,7 +1865,7 @@ function covertToNode() { name: selectedWorker.map( (v, i) => `${i + 1}. ` + - `${v.namePrefix}. ${v.firstNameEN} ${v.lastNameEN}`.toUpperCase(), + ` ${v.namePrefix}. ${v.firstNameEN ? `${v.firstNameEN} ${v.lastNameEN}` : `${v.firstName} ${v.lastName}`} `.toUpperCase(), ), }, }) diff --git a/src/pages/05_quotation/preview/ViewForm.vue b/src/pages/05_quotation/preview/ViewForm.vue index 0a12408f..9977a6c7 100644 --- a/src/pages/05_quotation/preview/ViewForm.vue +++ b/src/pages/05_quotation/preview/ViewForm.vue @@ -600,7 +600,7 @@ function print() { details?.worker.map( (v, i) => `${i + 1}. ` + - `${v.namePrefix}. ${v.firstNameEN} ${v.lastNameEN}`.toUpperCase(), + `${v.namePrefix}. ${v.firstNameEN ? `${v.firstNameEN} ${v.lastNameEN}` : `${v.firstName} ${v.lastName}`} `.toUpperCase(), ) || [], }, }) || '-' diff --git a/src/pages/11_credit-note/document-view/MainPage.vue b/src/pages/11_credit-note/document-view/MainPage.vue index f87d4b3b..73024f36 100644 --- a/src/pages/11_credit-note/document-view/MainPage.vue +++ b/src/pages/11_credit-note/document-view/MainPage.vue @@ -494,7 +494,7 @@ function closeAble() { details?.worker.map( (v, i) => `${i + 1}. ` + - `${v.namePrefix}. ${v.firstNameEN} ${v.lastNameEN}`.toUpperCase(), + `${v.namePrefix}. ${v.firstNameEN ? `${v.firstNameEN} ${v.lastNameEN}` : `${v.firstName} ${v.lastName}`} `.toUpperCase(), ) || [], }, }) || '-' diff --git a/src/pages/12_debit-note/document-view/MainPage.vue b/src/pages/12_debit-note/document-view/MainPage.vue index 7233ede7..563b4d02 100644 --- a/src/pages/12_debit-note/document-view/MainPage.vue +++ b/src/pages/12_debit-note/document-view/MainPage.vue @@ -501,7 +501,7 @@ function print() { details?.worker.map( (v, i) => `${i + 1}. ` + - `${v.namePrefix}. ${v.firstNameEN} ${v.lastNameEN}`.toUpperCase(), + `${v.namePrefix}. ${v.firstNameEN ? `${v.firstNameEN} ${v.lastNameEN}` : `${v.firstName} ${v.lastName}`} `.toUpperCase(), ) || [], }, }) || '-'