Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/jianping/AppHelpedResident/hrAdd.vue

@@ -9,7 +9,8 @@
               <div flex class="half wrap">
                 <div flex class="column">
                   <el-form-item label="姓名" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit :disabled="isEdit"/>
+                    <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit
+                              :disabled="isEdit"/>
                   </el-form-item>
                   <el-form-item label="身份证号" prop="idNumber">
                     <el-input v-model="form.idNumber" placeholder="请输入身份证号" :maxlength="18" :disabled="isEdit"
@@ -108,8 +109,7 @@
                 </template>
                 <template v-if="form.isHousehold==0">
                   <el-form-item label="与户主关系" prop="householdRelation">
-                    <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"
+                    <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
-                               @change="$forceUpdate()"/>
                   </el-form-item>
                   <el-form-item label="户主身份证号" prop="householdIdNumber">
                     <el-input v-model="form.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
@@ -208,11 +208,11 @@ export default {
   },
   computed: {
     ...mapState(['user']),
-    isEdit(){
+    isEdit() {
       return !!this.$route.query.id
     },
     addTitle() {
-      return this.isEdit? "编辑监测对象" : "添加监测对象"
+      return this.isEdit ? "编辑监测对象" : "添加监测对象"
     },
     rules() {
       return {
@@ -235,7 +235,9 @@ export default {
   },
   data() {
     return {
-      form: {}
+      form: {
+        householdRelation: ""
+      }
     }
   },
   methods: {
@@ -253,7 +255,7 @@ export default {
       })
     },
     handleIdNumberAutocomplete(v) {
-      let {birthday:birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v)
+      let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v)
       this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)}
     },
     submit() {