From d05eae23a99a1708ddd550865668f7a6508237e8 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Thu, 17 Oct 2024 17:39:20 +0700
Subject: [PATCH] fix: worker display number, expire date

---
 src/pages/05_quotation/QuotationForm.vue | 13 ++++++++++---
 src/stores/customer/index.ts             |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 87d50898..c28a7a07 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -394,6 +394,7 @@ async function assignWorkerToSelectedWorker() {
   if (quotationFormData.value.customerBranchId) {
     const retEmp = await customerStore.fetchBranchEmployee(
       quotationFormData.value.customerBranchId,
+      { passport: true },
     );
     if (retEmp) {
       workerList.value = retEmp.data.result;
@@ -560,7 +561,9 @@ watch(
     history.pushState({}, '', url.toString());
 
     if (!v) return;
-    const retEmp = await customerStore.fetchBranchEmployee(v);
+    const retEmp = await customerStore.fetchBranchEmployee(v, {
+      passport: true,
+    });
     if (retEmp) {
       workerList.value = retEmp.data.result;
     }
@@ -702,7 +705,9 @@ async function searchEmployee(text: string) {
                 fallback-img="/images/employee-avatar.png"
                 :rows="
                   selectedWorker.map((e: Employee) => ({
-                    foreignRefNo: '123456789',
+                    foreignRefNo: e.employeePassport
+                      ? e.employeePassport[0]?.number || '-'
+                      : '-',
                     employeeName:
                       $i18n.locale === 'eng'
                         ? `${e.firstNameEN} ${e.lastNameEN}`
@@ -711,7 +716,9 @@ async function searchEmployee(text: string) {
                     gender: e.gender,
                     age: calculateAge(e.dateOfBirth),
                     nationality: optionStore.mapOption(e.nationality),
-                    documentExpireDate: '1234',
+                    documentExpireDate: e.employeePassport
+                      ? dateFormat(e.employeePassport[0]?.expireDate) || '-'
+                      : '-',
                     imgUrl: `${baseUrl}/customer/${e.id}/image/${e.selectedImage}`,
                     status: e.status,
                   }))
diff --git a/src/stores/customer/index.ts b/src/stores/customer/index.ts
index 560607da..13b98568 100644
--- a/src/stores/customer/index.ts
+++ b/src/stores/customer/index.ts
@@ -58,6 +58,7 @@ const useCustomerStore = defineStore('api-customer', () => {
       query?: string;
       page?: number;
       pageSize?: number;
+      passport?: boolean;
     },
   ) {
     const params = new URLSearchParams();