diff --git a/src/components/form/AddressForm.vue b/src/components/form/AddressForm.vue
index 573b904b..c007e82a 100644
--- a/src/components/form/AddressForm.vue
+++ b/src/components/form/AddressForm.vue
@@ -33,13 +33,13 @@ const adrressStore = useAddressStore();
 const workplace = defineModel<string>('workplace', { default: '' });
 const workplaceEN = defineModel<string>('workplaceEn', { default: '' });
 const address = defineModel('address', { default: '' });
-const addressEN = defineModel('addressEN', { default: '' });
+const addressEN = defineModel('addressEn', { default: '' });
 const street = defineModel('street', { default: '' });
-const streetEN = defineModel('streetEN', { default: '' });
+const streetEN = defineModel('streetEn', { default: '' });
 const moo = defineModel('moo', { default: '' });
-const mooEN = defineModel('mooEN', { default: '' });
+const mooEN = defineModel('mooEn', { default: '' });
 const soi = defineModel('soi', { default: '' });
-const soiEN = defineModel('soiEN', { default: '' });
+const soiEN = defineModel('soiEn', { default: '' });
 const provinceId = defineModel<string | null | undefined>('provinceId');
 const districtId = defineModel<string | null | undefined>('districtId');
 const subDistrictId = defineModel<string | null | undefined>('subDistrictId');
@@ -51,7 +51,7 @@ const employmentOffice = defineModel<string | null | undefined>(
   'employmentOffice',
 );
 const employmentOfficeEN = defineModel<string | null | undefined>(
-  'employmentOfficeEN',
+  'employmentOfficeEn',
 );
 
 const addrOptions = reactive<{
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index c8139188..14b47ea3 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -1907,16 +1907,16 @@ watch(currentHq, () => {
             prefix-id="default"
             :title="'form.address'"
             v-model:address="formData.address"
-            v-model:addressEN="formData.addressEN"
+            v-model:address-en="formData.addressEN"
             v-model:province-id="formData.provinceId"
             v-model:district-id="formData.districtId"
             v-model:sub-district-id="formData.subDistrictId"
             v-model:moo="formData.moo"
-            v-model:mooEN="formData.mooEN"
+            v-model:moo-en="formData.mooEN"
             v-model:soi="formData.soi"
-            v-model:soiEN="formData.soiEN"
+            v-model:soi-en="formData.soiEN"
             v-model:street="formData.street"
-            v-model:streetEN="formData.streetEN"
+            v-model:street-en="formData.streetEN"
             :readonly="formType === 'view'"
             class="q-mb-xl"
           />
@@ -2259,16 +2259,16 @@ watch(currentHq, () => {
               :title="'form.address'"
               :readonly="formType === 'view'"
               v-model:address="formData.address"
-              v-model:addressEN="formData.addressEN"
+              v-model:address-en="formData.addressEN"
               v-model:province-id="formData.provinceId"
               v-model:district-id="formData.districtId"
               v-model:sub-district-id="formData.subDistrictId"
               v-model:moo="formData.moo"
-              v-model:mooEN="formData.mooEN"
+              v-model:moo-en="formData.mooEN"
               v-model:soi="formData.soi"
-              v-model:soiEN="formData.soiEN"
+              v-model:soi-en="formData.soiEN"
               v-model:street="formData.street"
-              v-model:streetEN="formData.streetEN"
+              v-model:street-en="formData.streetEN"
               v-model:zip-code="formData.zipCode"
               class="q-mb-xl"
             />
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index 31ff2e00..b13e7097 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -1742,17 +1742,17 @@ watch(
             <AddressForm
               id="info-address"
               v-model:address="formData.address"
-              v-model:addressEN="formData.addressEN"
+              v-model:address-en="formData.addressEN"
               v-model:moo="formData.moo"
-              v-model:mooEN="formData.mooEN"
+              v-model:moo-en="formData.mooEN"
               v-model:soi="formData.soi"
-              v-model:soiEN="formData.soiEN"
+              v-model:soi-en="formData.soiEN"
               v-model:street="formData.street"
-              v-model:streetEN="formData.streetEN"
-              v-model:provinceId="formData.provinceId"
-              v-model:districtId="formData.districtId"
-              v-model:subDistrictId="formData.subDistrictId"
-              v-model:zipCode="formData.zipCode"
+              v-model:street-en="formData.streetEN"
+              v-model:province-id="formData.provinceId"
+              v-model:district-id="formData.districtId"
+              v-model:sub-district-id="formData.subDistrictId"
+              v-model:zip-code="formData.zipCode"
               :readonly="!infoDrawerEdit"
               prefix-id="drawer-info-personnel"
               :title="'personnel.form.addressInformation'"
@@ -1959,17 +1959,17 @@ watch(
           <AddressForm
             id="dialog-form-address"
             v-model:address="formData.address"
-            v-model:addressEN="formData.addressEN"
+            v-model:address-en="formData.addressEN"
             v-model:moo="formData.moo"
-            v-model:mooEN="formData.mooEN"
+            v-model:moo-en="formData.mooEN"
             v-model:soi="formData.soi"
-            v-model:soiEN="formData.soiEN"
+            v-model:soi-en="formData.soiEN"
             v-model:street="formData.street"
-            v-model:streetEN="formData.streetEN"
-            v-model:provinceId="formData.provinceId"
-            v-model:districtId="formData.districtId"
-            v-model:subDistrictId="formData.subDistrictId"
-            v-model:zipCode="formData.zipCode"
+            v-model:street-en="formData.streetEN"
+            v-model:province-id="formData.provinceId"
+            v-model:district-id="formData.districtId"
+            v-model:sub-district-id="formData.subDistrictId"
+            v-model:zip-code="formData.zipCode"
             prefix-id="drawer-info-personnel"
             dense
             class="q-mb-xl"
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 53986d35..fe0b301c 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -2574,10 +2574,16 @@ const emptyCreateDialog = ref(false);
                 employeeFormState.formDataEmployeeSameAddr
               "
               v-model:address="currentFromDataEmployee.address"
-              v-model:addressEN="currentFromDataEmployee.addressEN"
-              v-model:provinceId="currentFromDataEmployee.provinceId"
-              v-model:districtId="currentFromDataEmployee.districtId"
-              v-model:subDistrictId="currentFromDataEmployee.subDistrictId"
+              v-model:address-en="currentFromDataEmployee.addressEN"
+              v-model:moo="currentFromDataEmployee.moo"
+              v-model:moo-en="currentFromDataEmployee.mooEN"
+              v-model:soi="currentFromDataEmployee.soi"
+              v-model:soi-en="currentFromDataEmployee.soiEN"
+              v-model:street="currentFromDataEmployee.street"
+              v-model:street-en="currentFromDataEmployee.streetEN"
+              v-model:province-id="currentFromDataEmployee.provinceId"
+              v-model:district-id="currentFromDataEmployee.districtId"
+              v-model:sub-district-id="currentFromDataEmployee.subDistrictId"
               employee
               dense
               class="q-mb-xl"
@@ -3804,11 +3810,17 @@ const emptyCreateDialog = ref(false);
                 id="drawer-form-personal-address"
                 employee
                 v-model:address="currentFromDataEmployee.address"
-                v-model:addressEN="currentFromDataEmployee.addressEN"
-                v-model:provinceId="currentFromDataEmployee.provinceId"
-                v-model:districtId="currentFromDataEmployee.districtId"
-                v-model:subDistrictId="currentFromDataEmployee.subDistrictId"
-                v-model:sameWithEmployer="
+                v-model:address-en="currentFromDataEmployee.addressEN"
+                v-model:moo="currentFromDataEmployee.moo"
+                v-model:moo-en="currentFromDataEmployee.mooEN"
+                v-model:soi="currentFromDataEmployee.soi"
+                v-model:soi-en="currentFromDataEmployee.soiEN"
+                v-model:street="currentFromDataEmployee.street"
+                v-model:street-en="currentFromDataEmployee.streetEN"
+                v-model:province-id="currentFromDataEmployee.provinceId"
+                v-model:district-id="currentFromDataEmployee.districtId"
+                v-model:sub-district-id="currentFromDataEmployee.subDistrictId"
+                v-model:same-with-employer="
                   employeeFormState.formDataEmployeeSameAddr
                 "
                 :readonly="!employeeFormState.isEmployeeEdit"
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
index 045a072b..dea3023b 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBranch.vue
@@ -185,22 +185,22 @@ withDefaults(
             use-employment
             :readonly="readonly"
             :title="$t('form.address')"
-            v-model:homeCode="item.homeCode"
-            v-model:employmentOffice="item.employmentOffice"
-            v-model:employmentOfficeEN="item.employmentOfficeEN"
+            v-model:home-code="item.homeCode"
+            v-model:employment-office="item.employmentOffice"
+            v-model:employment-office-en="item.employmentOfficeEN"
             v-model:address="item.address"
-            v-model:addressEN="item.addressEN"
+            v-model:address-en="item.addressEN"
             v-model:street="item.street"
-            v-model:streetEN="item.streetEN"
+            v-model:street-en="item.streetEN"
             v-model:moo="item.moo"
-            v-model:mooEN="item.mooEN"
+            v-model:moo-en="item.mooEN"
             v-model:soi="item.soi"
-            v-model:soiEN="item.soiEN"
+            v-model:soi-en="item.soiEN"
             v-model:province-id="item.provinceId"
             v-model:district-id="item.districtId"
             v-model:sub-district-id="item.subDistrictId"
-            :addressTitle="$t('form.address')"
-            :addressTitleEN="$t('form.address', { suffix: '(EN)' })"
+            :address-title="$t('form.address')"
+            :address-titleEN="$t('form.address', { suffix: '(EN)' })"
           />
         </q-tab-panel>
         <q-tab-panel name="contact">
diff --git a/src/pages/05_quotation/MainPage.vue b/src/pages/05_quotation/MainPage.vue
index 25920d40..fc0a51cf 100644
--- a/src/pages/05_quotation/MainPage.vue
+++ b/src/pages/05_quotation/MainPage.vue
@@ -1318,15 +1318,16 @@ watch(() => pageState.currentTab, fetchQuotationList);
             :addressTitle="$t('form.address')"
             :addressTitleEN="$t('form.address', { suffix: '(EN)' })"
             v-model:address="formDataCustomerBranch.address"
-            v-model:addres-e-n="formDataCustomerBranch.addressEN"
+            v-model:address-en="formDataCustomerBranch.addressEN"
             v-model:street="formDataCustomerBranch.street"
-            v-model:street-e-n="formDataCustomerBranch.streetEN"
+            v-model:street-en="formDataCustomerBranch.streetEN"
             v-model:moo="formDataCustomerBranch.moo"
-            v-model:moo-e-n="formDataCustomerBranch.mooEN"
+            v-model:moo-en="formDataCustomerBranch.mooEN"
             v-model:soi="formDataCustomerBranch.soi"
-            v-model:soi-e-nn="formDataCustomerBranch.soiEN"
+            v-model:soi-en="formDataCustomerBranch.soiEN"
             v-model:province-id="formDataCustomerBranch.provinceId"
             v-model:district-id="formDataCustomerBranch.districtId"
+            v-model:sub-district-id="formDataCustomerBranch.subDistrictId"
             v-model:home-code="formDataCustomerBranch.homeCode"
           />
         </div>