@@ -386,9 +387,8 @@ watch(
field-name="postalRegion_code"
:village-code="values.village_code"
:placeholder="getFieldState('postalRegion_code').placeholder"
- :is-disabled="getFieldState('postalRegion_code').disabled || !values.village_code"
+ :is-disabled="isReadonly || getFieldState('postalRegion_code').disabled || !values.village_code"
/>
-
-
+
diff --git a/app/components/app/person-address/entry-form.vue b/app/components/app/person-address/entry-form.vue
index b3ef300d..15bb71a2 100644
--- a/app/components/app/person-address/entry-form.vue
+++ b/app/components/app/person-address/entry-form.vue
@@ -1,37 +1,45 @@
-
+
diff --git a/app/components/app/person-address/fields/index.ts b/app/components/app/person-address/fields/index.ts
new file mode 100644
index 00000000..8dda6cde
--- /dev/null
+++ b/app/components/app/person-address/fields/index.ts
@@ -0,0 +1,6 @@
+export { default as RadioResidence } from './radio-residence.vue'
+export { default as SelectDistrict } from './select-district.vue'
+export { default as SelectPostal } from './select-postal.vue'
+export { default as SelectProvince } from './select-province.vue'
+export { default as SelectRegency } from './select-regency.vue'
+export { default as SelectVillage } from './select-village.vue'
diff --git a/app/components/app/person-address/_common/radio-residence.vue b/app/components/app/person-address/fields/radio-residence.vue
similarity index 100%
rename from app/components/app/person-address/_common/radio-residence.vue
rename to app/components/app/person-address/fields/radio-residence.vue
diff --git a/app/components/app/person-address/_common/select-district.vue b/app/components/app/person-address/fields/select-district.vue
similarity index 100%
rename from app/components/app/person-address/_common/select-district.vue
rename to app/components/app/person-address/fields/select-district.vue
diff --git a/app/components/app/person-address/_common/select-postal.vue b/app/components/app/person-address/fields/select-postal.vue
similarity index 100%
rename from app/components/app/person-address/_common/select-postal.vue
rename to app/components/app/person-address/fields/select-postal.vue
diff --git a/app/components/app/person-address/_common/select-province.vue b/app/components/app/person-address/fields/select-province.vue
similarity index 100%
rename from app/components/app/person-address/_common/select-province.vue
rename to app/components/app/person-address/fields/select-province.vue
diff --git a/app/components/app/person-address/_common/select-regency.vue b/app/components/app/person-address/fields/select-regency.vue
similarity index 100%
rename from app/components/app/person-address/_common/select-regency.vue
rename to app/components/app/person-address/fields/select-regency.vue
diff --git a/app/components/app/person-address/_common/select-village.vue b/app/components/app/person-address/fields/select-village.vue
similarity index 100%
rename from app/components/app/person-address/_common/select-village.vue
rename to app/components/app/person-address/fields/select-village.vue
diff --git a/app/components/app/person-contact/entry-form.vue b/app/components/app/person-contact/entry-form.vue
index bcbc8aea..1ef212b7 100644
--- a/app/components/app/person-contact/entry-form.vue
+++ b/app/components/app/person-contact/entry-form.vue
@@ -1,41 +1,45 @@
-
+
diff --git a/app/components/app/person-contact/fields/index.ts b/app/components/app/person-contact/fields/index.ts
new file mode 100644
index 00000000..883e16c7
--- /dev/null
+++ b/app/components/app/person-contact/fields/index.ts
@@ -0,0 +1 @@
+export { default as SelectContactType } from './select-contact-type.vue'
diff --git a/app/components/app/person-contact/_common/select-contact-type.vue b/app/components/app/person-contact/fields/select-contact-type.vue
similarity index 65%
rename from app/components/app/person-contact/_common/select-contact-type.vue
rename to app/components/app/person-contact/fields/select-contact-type.vue
index d6f8fe24..c63a0bee 100644
--- a/app/components/app/person-contact/_common/select-contact-type.vue
+++ b/app/components/app/person-contact/fields/select-contact-type.vue
@@ -1,14 +1,13 @@
-
-
-
+
-
-
+
+
diff --git a/app/components/app/person-relative/entry-form.vue b/app/components/app/person-relative/entry-form.vue
index 411fab37..9c66b275 100644
--- a/app/components/app/person-relative/entry-form.vue
+++ b/app/components/app/person-relative/entry-form.vue
@@ -1,46 +1,49 @@
-
+
diff --git a/app/components/app/person-relative/fields/index.ts b/app/components/app/person-relative/fields/index.ts
new file mode 100644
index 00000000..e6611949
--- /dev/null
+++ b/app/components/app/person-relative/fields/index.ts
@@ -0,0 +1 @@
+export { default as SelectRelations } from './select-relations.vue'
diff --git a/app/components/app/person-relative/_common/select-relations.vue b/app/components/app/person-relative/fields/select-relations.vue
similarity index 61%
rename from app/components/app/person-relative/_common/select-relations.vue
rename to app/components/app/person-relative/fields/select-relations.vue
index 5c3d2594..615c6c3c 100644
--- a/app/components/app/person-relative/_common/select-relations.vue
+++ b/app/components/app/person-relative/fields/select-relations.vue
@@ -1,36 +1,47 @@
-
-
+
+ {{ label }}
+
+