diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index 007fd63f9fd0ac90e55ac26f3e926943a76b15dd..e7955cfb5cfe7888a6489adcc59432114f24c30b 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -38,7 +38,7 @@
:style="{opacity: item.required ? 1 : 0}">*{{item.label}}
- {{form[item.value]? formMat[item.value]:'请选择'}}
+ {{form[item.value] && formMat[item.value] ? formMat[item.value]:'请选择'}}
@@ -1704,10 +1704,19 @@
this.isRead = true
const data = d.object.reportContent || {}
this.form = data
- this.form['householdValues'] = data['householdProvince'] + "," + data['householdCity'] + "," + data[
- 'householdDistrict']
- this.form['residenceValue'] = data['residenceProvince'] + "," + data['residenceCity'] + "," + data[
- 'residenceDistrict']
+ if(data['householdProvince']) {
+ const val = data['householdProvince'] + "," + data['householdCity'] + "," + data[
+ 'householdDistrict']
+
+ this.$set(this.form,'householdValues',val )
+
+ }
+ if(data['residenceProvince']) {
+ const val = data['residenceProvince'] + "," + data['residenceCity'] + "," + data[
+ 'residenceDistrict']
+ this.$set(this.form,'residenceValue',val )
+ }
+
// 赋值
for (let k in data) {
const val = data[k]
diff --git a/pages/fillInDay/fillInDay.vue b/pages/fillInDay/fillInDay.vue
index d7b844fa5b11b9aa48bbbc66dc8061ce2d91b58f..00700004da1404d0e59a8f080dc1faebc1bd1859 100644
--- a/pages/fillInDay/fillInDay.vue
+++ b/pages/fillInDay/fillInDay.vue
@@ -27,7 +27,7 @@
:style="{opacity: item.required ? 1 : 0}">*{{item.label}}
- {{form[item.value]?formMat[item.value]:'请选择'}}
+ {{form[item.value] && formMat[item.value] ? formMat[item.value]:'请选择'}}