From 6e6caf4a1b1f5ec8c3ddb5d5af8392a030a41783 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Tue, 5 Sep 2023 16:36:02 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=84=20zipcode=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Information/Address.vue | 22 +++++++----- .../04_registry/components/profileType.ts | 2 ++ .../views/Information/Address.vue | 36 ++++++++++++------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/modules/04_registry/components/Information/Address.vue b/src/modules/04_registry/components/Information/Address.vue index 95c6d657e..703c3dc98 100644 --- a/src/modules/04_registry/components/Information/Address.vue +++ b/src/modules/04_registry/components/Information/Address.vue @@ -116,7 +116,7 @@ lazy-rules readonly borderless - v-model="codep" + v-model="addressData.codep" :style="!edit ? '' : 'padding:0 12px;'" :label="`${'รหัสไปรษณีย์'}`" /> @@ -248,7 +248,7 @@ lazy-rules readonly borderless - v-model="codec" + v-model="addressData.codec" :style="!edit ? '' : 'padding:0 12px;'" :label="`${'รหัสไปรษณีย์'}`" /> @@ -528,6 +528,8 @@ const defaultAdd = () => { provinceIdC: null, districtIdC: null, subdistrictIdC: null, + codep: null, + codec: null, same: "0", }; } @@ -643,6 +645,8 @@ const fetchData = async () => { addressData.value.subdistrictId = data.registrationSubDistrictId; addressData.value.subdistrictIdC = data.currentSubDistrictId; addressData.value.same = data.registrationSame ? "1" : "0"; + addressData.value.codec = data.currentZipCode; + addressData.value.codep = data.registrationZipCode; }) .catch((e) => { messageError($q, e); @@ -729,15 +733,17 @@ const saveData = async () => { }; const selectProvince = async (e: string | null, name: string) => { + console.log("5555555555555"); + if (e != null) { if (name == "1") { addressData.value.districtId = ""; addressData.value.subdistrictId = ""; - codep.value = ""; + addressData.value.codep = ""; } else { addressData.value.districtIdC = ""; addressData.value.subdistrictIdC = ""; - codec.value = ""; + addressData.value.codec = ""; } myform.value.resetValidation(); await fetchDistrict(e, name); @@ -748,10 +754,10 @@ const selectDistrict = async (e: string | null, name: string) => { if (e != null) { if (name == "1") { addressData.value.subdistrictId = ""; - codep.value = ""; + addressData.value.codep = ""; } else { addressData.value.subdistrictIdC = ""; - codec.value = ""; + addressData.value.codec = ""; } myform.value.resetValidation(); await fetchSubDistrict(e, name); @@ -763,11 +769,11 @@ const selectSubDistrict = (e: string | null, name: string) => { if (name == "1") { const findcode = Ops.value.subdistrictOps.filter((r) => r.id == e); const namecode = findcode.length > 0 ? findcode[0].zipCode : ""; - codep.value = namecode; + addressData.value.codep = namecode; } else { const findcode = Ops.value.subdistrictCOps.filter((r) => r.id == e); const namecode = findcode.length > 0 ? findcode[0].zipCode : ""; - codec.value = namecode; + addressData.value.codec = namecode; } } }; diff --git a/src/modules/04_registry/components/profileType.ts b/src/modules/04_registry/components/profileType.ts index 4ee2b6521..caf829f0e 100644 --- a/src/modules/04_registry/components/profileType.ts +++ b/src/modules/04_registry/components/profileType.ts @@ -64,6 +64,8 @@ interface Address { districtIdC: string | null; subdistrictIdC: string | null; same: string | null; + codec: string | null; + codep: string | null; } interface Goverment { diff --git a/src/modules/08_registryEmployee/views/Information/Address.vue b/src/modules/08_registryEmployee/views/Information/Address.vue index 06acd23c2..abd64d95c 100644 --- a/src/modules/08_registryEmployee/views/Information/Address.vue +++ b/src/modules/08_registryEmployee/views/Information/Address.vue @@ -116,7 +116,7 @@ lazy-rules readonly borderless - v-model="codep" + v-model="addressData.codep" :style="!edit ? '' : 'padding:0 12px;'" :label="`${'รหัสไปรษณีย์'}`" /> @@ -248,7 +248,7 @@ lazy-rules readonly borderless - v-model="codec" + v-model="addressData.codec" :style="!edit ? '' : 'padding:0 12px;'" :label="`${'รหัสไปรษณีย์'}`" /> @@ -323,7 +323,14 @@ const route = useRoute(); const $q = useQuasar(); const mixin = useCounterMixin(); -const { date2Thai, success, messageError, showLoader, hideLoader, dialogConfirm } = mixin; +const { + date2Thai, + success, + messageError, + showLoader, + hideLoader, + dialogConfirm, +} = mixin; const edit = ref(false); const addressData = ref
(defaultAddress); const myform = ref(); @@ -528,6 +535,8 @@ const defaultAdd = () => { provinceIdC: null, districtIdC: null, subdistrictIdC: null, + codep: null, + codec: null, same: "0", }; } @@ -643,10 +652,11 @@ const fetchData = async () => { addressData.value.subdistrictId = data.registrationSubDistrictId; addressData.value.subdistrictIdC = data.currentSubDistrictId; addressData.value.same = data.registrationSame ? "1" : "0"; + addressData.value.codec = data.currentZipCode; + addressData.value.codep = data.registrationZipCode; console.log(res); }) - - + .catch((e) => { messageError($q, e); }) @@ -718,8 +728,8 @@ const addData = async () => { // }); }; const saveData = async () => { - dialogConfirm($q,() => Datasave()) -} + dialogConfirm($q, () => Datasave()); +}; const Datasave = async () => { await myform.value.validate().then(async (success: boolean) => { if (success) { @@ -738,11 +748,11 @@ const selectProvince = async (e: string | null, name: string) => { if (name == "1") { addressData.value.districtId = ""; addressData.value.subdistrictId = ""; - codep.value = ""; + addressData.value.codep = ""; } else { addressData.value.districtIdC = ""; addressData.value.subdistrictIdC = ""; - codec.value = ""; + addressData.value.codec = ""; } myform.value.resetValidation(); await fetchDistrict(e, name); @@ -753,10 +763,10 @@ const selectDistrict = async (e: string | null, name: string) => { if (e != null) { if (name == "1") { addressData.value.subdistrictId = ""; - codep.value = ""; + addressData.value.codep = ""; } else { addressData.value.subdistrictIdC = ""; - codec.value = ""; + addressData.value.codec = ""; } myform.value.resetValidation(); await fetchSubDistrict(e, name); @@ -768,11 +778,11 @@ const selectSubDistrict = (e: string | null, name: string) => { if (name == "1") { const findcode = Ops.value.subdistrictOps.filter((r) => r.id == e); const namecode = findcode.length > 0 ? findcode[0].zipCode : ""; - codep.value = namecode; + addressData.value.codep = namecode; } else { const findcode = Ops.value.subdistrictCOps.filter((r) => r.id == e); const namecode = findcode.length > 0 ? findcode[0].zipCode : ""; - codec.value = namecode; + addressData.value.codec = namecode; } } };