From cf7ff16fd3a2e7c3497042369e39fcb51fb2e160 Mon Sep 17 00:00:00 2001
From: lrw <18279117177@163.com>
Date: Sun, 16 Feb 2020 21:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/fillIn/fillIn.vue       | 19 ++++++++++++++-----
 pages/fillInDay/fillInDay.vue |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index 007fd63..e7955cf 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -38,7 +38,7 @@
 							 :style="{opacity: item.required ? 1 : 0}">*</span>{{item.label}}</view>
 						<picker @change="updatePickerVal($event,item)" range-key="label" mode="selector" :value="form[item.value]" :range="item.opts">
 							<view class="picker">
-								{{form[item.value]? formMat[item.value]:'请选择'}}
+								{{form[item.value] && formMat[item.value] ? formMat[item.value]:'请选择'}}
 							</view>
 						</picker>
 					</view>
@@ -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 d7b844f..0070000 100644
--- a/pages/fillInDay/fillInDay.vue
+++ b/pages/fillInDay/fillInDay.vue
@@ -27,7 +27,7 @@
 							 :style="{opacity: item.required ? 1 : 0}">*</span>{{item.label}}</view>
 						<picker @change="updatePickerVal($event,item)" range-key="label" mode="selector" :value="form[item.value]" :range="item.opts">
 							<view class="picker">
-								{{form[item.value]?formMat[item.value]:'请选择'}}
+								{{form[item.value] && formMat[item.value] ? formMat[item.value]:'请选择'}}
 							</view>
 						</picker>
 					</view>
-- 
2.22.0