From c05e26f36b6f7eb50fe974dc08178e5c3098551b Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Tue, 23 Jul 2024 04:25:09 +0000
Subject: [PATCH] fix: column i18n

---
 src/pages/03_customer-management/MainPage.vue | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 0141b948..7c08feb1 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -242,27 +242,27 @@ const fieldDisplayEmployer = ref<
   }[]
 >([
   {
-    label: t('corporation'),
+    label: 'corporation',
     value: 'customerName',
   },
 
   {
-    label: t('type'),
+    label: 'type',
     value: 'type',
   },
 
   {
-    label: t('name'),
+    label: 'name',
     value: 'personName',
   },
 
   {
-    label: t('telephone'),
+    label: 'telephone',
     value: 'telephoneNo',
   },
 
   {
-    label: t('formDialogInputEmail'),
+    label: 'formDialogInputEmail',
     value: 'branchEmail',
   },
 ]);
@@ -274,37 +274,37 @@ const fieldDisplayEmployee = ref<
   }[]
 >([
   {
-    label: t('nameEmployee'),
+    label: 'nameEmployee',
     value: 'firstName',
   },
   {
-    label: t('formDialogInputNationality'),
+    label: 'formDialogInputNationality',
     value: 'formDialogInputNationality',
   },
   {
-    label: t('formDialogInputPassportNo'),
+    label: 'formDialogInputPassportNo',
     value: 'formDialogInputPassportNo',
   },
 
   {
-    label: t('formDialogInputAge'),
+    label: 'formDialogInputAge',
     value: 'formDialogInputAge',
   },
   {
-    label: t('passportExpire'),
+    label: 'passportExpire',
     value: 'passportExpiryDate',
   },
   {
-    label: t('formDialogEmployeeNRCNo'),
+    label: 'formDialogEmployeeNRCNo',
     value: 'formDialogEmployeeNRCNo',
   },
 
   {
-    label: t('branchLabel'),
+    label: 'branchLabel',
     value: 'branchLabel',
   },
   {
-    label: t('type'),
+    label: 'type',
     value: 'type',
   },
 ]);
@@ -1737,7 +1737,7 @@ watch(
                 :display-value="$t('displayField')"
                 :hide-dropdown-icon="$q.screen.lt.sm"
                 v-model="fieldSelected"
-                option-label="label"
+                :option-label="(l) => $t(l.label)"
                 option-value="value"
                 map-options
                 emit-value
@@ -2379,9 +2379,10 @@ watch(
                           v-for="col in props.cols"
                           :key="col.name"
                           :props="props"
-                          st
                         >
-                          {{ $t(col.label) }}
+                          <span v-if="col.label !== ''">
+                            {{ $t(col.label) }}
+                          </span>
                         </q-th>
                       </q-tr>
                     </template>