From d36a5fc3a0a953334c7b7384bb9d34e7fb0344d4 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 16:55:13 +0800 Subject: [PATCH] bug564 --- .../components/Business/BusinessUsageMode.vue | 18 +++++++------- ...operOwningDepartmentAndServiceProvider.vue | 24 +++++++++---------- .../LayerService/LayerServiceUsageMode.vue | 18 +++++++------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 42799119..09512ec4 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -138,10 +138,12 @@ flag.value = false } else { // eslint-disable-next-line vue/no-setup-props-destructure - dataFrom.value.content[0].link.value = props.dataList.apiUrl - dataFrom.value.content[0].facilitator.value = props.dataList.deptName - dataFrom.value.content[0].people.value = props.dataList.deptContacts - dataFrom.value.content[0].phone.value = props.dataList.deptPhone + dataFrom.value.content[0].link.value = props.dataList.apiUrl || '--' + dataFrom.value.content[0].facilitator.value = + props.dataList.deptName || '--' + dataFrom.value.content[0].people.value = + props.dataList.deptContacts || '--' + dataFrom.value.content[0].phone.value = props.dataList.deptPhone || '--' console.log('dataList', props.dataList) props.dataList.infoList.map((item) => { if (item.attrType === '组件地址') { @@ -173,10 +175,10 @@ if (!obj) { flag.value = false } else { - dataFrom.value.content[0].link.value = val.apiUrl - dataFrom.value.content[0].facilitator.value = val.deptName - dataFrom.value.content[0].people.value = val.deptContacts - dataFrom.value.content[0].phone.value = val.deptPhone + dataFrom.value.content[0].link.value = val.apiUrl || '--' + dataFrom.value.content[0].facilitator.value = val.deptName || '--' + dataFrom.value.content[0].people.value = val.deptContacts || '--' + dataFrom.value.content[0].phone.value = val.deptPhone || '--' console.log('dataList', val) val.infoList.map((item) => { if (item.attrType === '组件地址') { diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index 56036349..8d08732f 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -103,23 +103,23 @@ flag.value = false } else { dataFrom.value.content[0].childrenContent[1].attrValue = - props.dataList.deptContacts + props.dataList.deptContacts || '--' dataFrom.value.content[0].childrenContent[2].attrValue = - props.dataList.deptPhone + props.dataList.deptPhone || '--' dataFrom.value.content[0].childrenContent[0].attrValue = - props.dataList.deptName + props.dataList.deptName || '--' props.dataList.infoList.map((item) => { if (item.attrType == '组件地址') { dataFrom.value.link = item.attrValue } else if (item.attrType == '服务商联系人') { dataFrom.value.content[1].childrenContent[1].attrValue = - item.attrValue + item.attrValue || '--' } else if (item.attrType == '服务商联系电话') { dataFrom.value.content[1].childrenContent[2].attrValue = - item.attrValue + item.attrValue || '--' } else if (item.attrType == '服务商' || item.attrType == '服务商名') { dataFrom.value.content[1].childrenContent[0].attrValue = - item.attrValue + item.attrValue || '--' } }) } @@ -165,26 +165,26 @@ flag.value = false } else { dataFrom.value.content[0].childrenContent[1].attrValue = - props.dataList.deptContacts + props.dataList.deptContacts || '--' dataFrom.value.content[0].childrenContent[2].attrValue = - props.dataList.deptPhone + props.dataList.deptPhone || '--' dataFrom.value.content[0].childrenContent[0].attrValue = - props.dataList.deptName + props.dataList.deptName || '--' props.dataList.infoList.map((item) => { if (item.attrType == '组件地址') { dataFrom.value.link = item.attrValue } else if (item.attrType == '服务商联系人') { dataFrom.value.content[1].childrenContent[1].attrValue = - item.attrValue + item.attrValue || '--' } else if (item.attrType == '服务商联系电话') { dataFrom.value.content[1].childrenContent[2].attrValue = - item.attrValue + item.attrValue || '--' } else if ( item.attrType == '服务商' || item.attrType == '服务商名' ) { dataFrom.value.content[1].childrenContent[0].attrValue = - item.attrValue + item.attrValue || '--' } }) } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index dfc321e3..b3148f0d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -142,10 +142,12 @@ flag.value = false } else { // eslint-disable-next-line vue/no-setup-props-destructure - dataFrom.value.content[0].link.value = props.dataList.apiUrl - dataFrom.value.content[0].facilitator.value = props.dataList.deptName - dataFrom.value.content[0].people.value = props.dataList.deptContacts - dataFrom.value.content[0].phone.value = props.dataList.deptPhone + dataFrom.value.content[0].link.value = props.dataList.apiUrl || '--' + dataFrom.value.content[0].facilitator.value = + props.dataList.deptName || '--' + dataFrom.value.content[0].people.value = + props.dataList.deptContacts || '--' + dataFrom.value.content[0].phone.value = props.dataList.deptPhone || '--' console.log('dataList', props.dataList) props.dataList.infoList.map((item) => { if (item.attrType === '服务地址') { @@ -179,10 +181,10 @@ if (!obj) { flag.value = false } else { - dataFrom.value.content[0].link.value = val.apiUrl - dataFrom.value.content[0].facilitator.value = val.deptName - dataFrom.value.content[0].people.value = val.deptContacts - dataFrom.value.content[0].phone.value = val.deptPhone + dataFrom.value.content[0].link.value = val.apiUrl || '--' + dataFrom.value.content[0].facilitator.value = val.deptName || '--' + dataFrom.value.content[0].people.value = val.deptContacts || '--' + dataFrom.value.content[0].phone.value = val.deptPhone || '--' console.log('dataList', val) val.infoList.map((item) => { if (item.attrType === '服务地址') {