From 9d745d8e52ccbc9ebf0b5bbb0fc70c8bd5b61f73 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Thu, 3 Oct 2024 18:10:40 +0700 Subject: [PATCH] refactor: worker select & employee nationality --- .../03_customer-management/TableEmpoloyee.vue | 2 +- src/components/05_quotation/WorkerItem.vue | 9 +- src/components/shared/SelectZone.vue | 15 ++- src/pages/05_quotation/QuotationForm.vue | 119 +++++++++++------- src/utils/datetime.ts | 7 +- 5 files changed, 100 insertions(+), 52 deletions(-) diff --git a/src/components/03_customer-management/TableEmpoloyee.vue b/src/components/03_customer-management/TableEmpoloyee.vue index 21ebc2bc..f7b6adfd 100644 --- a/src/components/03_customer-management/TableEmpoloyee.vue +++ b/src/components/03_customer-management/TableEmpoloyee.vue @@ -258,7 +258,7 @@ defineEmits<{ detail: [ { icon: 'mdi-passport', - value: props.row.nationality, + value: optionStore.mapOption(props.row.nationality), }, { diff --git a/src/components/05_quotation/WorkerItem.vue b/src/components/05_quotation/WorkerItem.vue index 234b00fd..0198788f 100644 --- a/src/components/05_quotation/WorkerItem.vue +++ b/src/components/05_quotation/WorkerItem.vue @@ -9,6 +9,7 @@ defineEmits<{ withDefaults( defineProps<{ employeeAmount: number; + fallbackImg?: string; rows: { foreignRefNo: string; employeeName: string; @@ -92,7 +93,11 @@ const columns = [ >