From 2511690d547c479df8efdfdaac68a526bd8ff573 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Fri, 4 Apr 2025 11:28:41 +0700
Subject: [PATCH] refactor: handle input require name en

---
 .../02_personnel-management/FormPerson.vue    | 42 +++++++++++++------
 src/pages/03_customer-management/MainPage.vue |  2 +
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue
index 5fa321b6..7773b161 100644
--- a/src/components/02_personnel-management/FormPerson.vue
+++ b/src/components/02_personnel-management/FormPerson.vue
@@ -196,7 +196,11 @@ watch(
           class="col"
           :label="$t('personnel.form.firstName')"
           v-model="firstName"
-          :rules="[(val: string) => !!val || $t('form.error.required')]"
+          :rules="
+            employee
+              ? []
+              : [(val: string) => !!val || $t('form.error.required')]
+          "
         />
 
         <q-input
@@ -289,10 +293,22 @@ watch(
           class="col"
           label="Surname"
           v-model="lastNameEN"
-          :rules="[
-            (val: string) =>
-              !val || /^[A-Za-z\s]+$/.test(val) || $t('form.error.letterOnly'),
-          ]"
+          :rules="
+            employee
+              ? [
+                  (val: string) => !!val || $t('form.error.required'),
+                  (val: string) =>
+                    !val ||
+                    /^[A-Za-z\s]+$/.test(val) ||
+                    $t('form.error.letterOnly'),
+                ]
+              : [
+                  (val: string) =>
+                    !val ||
+                    /^[A-Za-z\s]+$/.test(val) ||
+                    $t('form.error.letterOnly'),
+                ]
+          "
         />
       </div>
 
@@ -394,11 +410,15 @@ watch(
         :readonly="readonly"
         :label="$t('form.birthDate')"
         :disabled-dates="disabledAfterToday"
-        :rules="[
-          (val: string) =>
-            !!val ||
-            $t('form.error.selectField', { field: $t('form.birthDate') }),
-        ]"
+        :rules="
+          employee
+            ? []
+            : [
+                (val: string) =>
+                  !!val ||
+                  $t('form.error.selectField', { field: $t('form.birthDate') }),
+              ]
+        "
       />
 
       <q-input
@@ -480,7 +500,6 @@ watch(
         :hide-dropdown-icon="readonly"
         :for="`${prefixId}-select-gender`"
         :label="$t('form.gender')"
-        :rules="[(val: string) => !!val || $t('form.error.required')]"
         @filter="genderFilter"
       >
         <template v-slot:no-option>
@@ -513,7 +532,6 @@ watch(
         :hide-dropdown-icon="readonly"
         :for="`${prefixId}-select-nationality`"
         :label="$t('general.nationality')"
-        :rules="[(val: string) => !!val || $t('form.error.required')]"
         @filter="nationalityFilter"
       >
         <template v-slot:no-option>
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 8d962613..45482ec4 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -2918,6 +2918,7 @@ const emptyCreateDialog = ref(false);
               class="q-mb-xl"
             />
             <AddressForm
+              disabledRule
               id="form-personal-address"
               prefix-id="form-employee"
               :readonly="!employeeFormState.isEmployeeEdit"
@@ -4871,6 +4872,7 @@ const emptyCreateDialog = ref(false);
               <AddressForm
                 id="drawer-form-personal-address"
                 employee
+                disabledRule
                 v-model:address="currentFromDataEmployee.address"
                 v-model:address-en="currentFromDataEmployee.addressEN"
                 v-model:moo="currentFromDataEmployee.moo"