diff --git a/src/views/database/connect_enterprises_management/components/editDialog.vue b/src/views/database/connect_enterprises_management/components/editDialog.vue index d856d4a..5d10d5d 100644 --- a/src/views/database/connect_enterprises_management/components/editDialog.vue +++ b/src/views/database/connect_enterprises_management/components/editDialog.vue @@ -470,15 +470,12 @@ const fnGetData = async () => { if (!props.corpInfoId) return; const { data } = await getBusCompanyInfo({ id: props.corpInfoId }); form.value = data; - form.value.area = form.value.province - ? [ - form.value.province, - form.value.city, - form.value.county, - form.value.village, - form.value.street, - ] - : []; + form.value.area = []; + if (form.value.province) form.value.area.push(form.value.province); + if (form.value.city) form.value.area.push(form.value.city); + if (form.value.county) form.value.area.push(form.value.county); + if (form.value.village) form.value.area.push(form.value.village); + if (form.value.street) form.value.area.push(form.value.street); form.value.sectorId = data.sectorId.split(","); form.value.address = form.value.longitude ? `${form.value.longitude}-${form.value.latitude}` diff --git a/src/views/database/superior_platform_management/components/editDialog.vue b/src/views/database/superior_platform_management/components/editDialog.vue index 4187ad9..c0fc4a6 100644 --- a/src/views/database/superior_platform_management/components/editDialog.vue +++ b/src/views/database/superior_platform_management/components/editDialog.vue @@ -122,13 +122,12 @@ const fnGetData = async () => { if (!props.corpInfoId) return; const { data } = await getBusThirdPlatform({ id: props.corpInfoId }); form.value = data; - form.value.area = [ - form.value.province, - form.value.city, - form.value.county, - form.value.village, - form.value.street, - ]; + form.value.area = []; + if (form.value.province) form.value.area.push(form.value.province); + if (form.value.city) form.value.area.push(form.value.city); + if (form.value.county) form.value.area.push(form.value.county); + if (form.value.village) form.value.area.push(form.value.village); + if (form.value.street) form.value.area.push(form.value.street); }; fnGetData(); const appAreaRef = useTemplateRef("areaRef"); diff --git a/src/views/database/superior_platform_management/components/infoDialog.vue b/src/views/database/superior_platform_management/components/infoDialog.vue index 9678d28..ff64868 100644 --- a/src/views/database/superior_platform_management/components/infoDialog.vue +++ b/src/views/database/superior_platform_management/components/infoDialog.vue @@ -7,7 +7,7 @@ :options="dictionariesList" :props="{ value: 'name', label: 'name', children: 'list' }" > --> - + @@ -116,13 +116,12 @@ const fnGetData = async () => { if (!props.corpInfoId) return; const { data } = await getBusThirdPlatform({ id: props.corpInfoId }); form.value = data; - form.value.area = [ - form.value.province, - form.value.city, - form.value.county, - form.value.village, - form.value.street, - ]; + form.value.area = []; + if (form.value.province) form.value.area.push(form.value.province); + if (form.value.city) form.value.area.push(form.value.city); + if (form.value.county) form.value.area.push(form.value.county); + if (form.value.village) form.value.area.push(form.value.village); + if (form.value.street) form.value.area.push(form.value.street); }; fnGetData(); const fnClose = () => {