Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMonitoringObject/Add.vue

@@ -635,9 +635,12 @@ export default {
     },
 
     submit() {
+
+      if(!this.isEdit) {
         if (!this.form.riskType) {
           return this.$u.toast('请选择风险因素')
         }
+      }
 
       this.basicsCheckList.map((item, index) => {
         if (item.checked) {

src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue

@@ -532,6 +532,13 @@ export default {
           } else {
             this.form.files = []
           }
+
+          res.data.healthyStatusList = res.data.healthyStatus.split(',')
+          res.data.healthyStatusList.map((item) => {
+            this.helthList.map(items => {
+              items.checked = item == items.dictValue
+            })
+          })
         }
       })
     },
@@ -620,7 +627,8 @@ export default {
         ...this.form,
         id: this.id || '',
         girdId: this.user.girdCheckType == 1 ? this.user.girdId : '',
-        householdIdNumber: this.householdIdNumber
+        householdIdNumber: this.householdIdNumber,
+        isHousehold: '0',
       }).then(res => {
         if (res.code == 0) {
           this.$u.toast(this.isEdit ? '保存成功' : '提交成功')