diff --git a/src/apps/AppInfotainment/newsList.vue b/src/apps/AppInfotainment/newsList.vue
index 7d71cd9c..3d245d5d 100644
--- a/src/apps/AppInfotainment/newsList.vue
+++ b/src/apps/AppInfotainment/newsList.vue
@@ -65,13 +65,6 @@ export default {
this.getListInit()
},
- // onConfirm () {
- // this.current = 1
- // this.$nextTick(() => {
- // this.getNewsList(this.areaId)
- // })
- // },
-
// 获取新闻分类
getList() {
return this.$http.post('/app/apppublicitycategory/list', null, {
@@ -119,7 +112,7 @@ export default {
onReachBottom() {
this.current++,
- this.getNewsList()
+ this.getNewsList()
}
}
diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 266abaa2..fb3cb9a9 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -184,7 +184,8 @@
@@ -615,7 +616,7 @@ export default {
this.form.photo = this.form.files[0].url
}
if (this.photo.length) {
- this.form.photo = this.photo[0].accessUrl
+ this.form.photo = this.photo[0].url
}
this.form.girdId = this.girdInfo.girdId
@@ -636,12 +637,17 @@ export default {
submit() {
+
if(!this.isEdit) {
if (!this.form.riskType) {
return this.$u.toast('请选择风险因素')
}
}
+ if (this.photo.length) {
+ this.form.photo = this.photo[0].url
+ }
+
this.basicsCheckList.map((item, index) => {
if (item.checked) {
this.basicsList.push(index)
@@ -718,11 +724,13 @@ export default {
...this.form,
...res.data
}
- this.photo = [{url: this.form.photo}]
+ // this.photo = [{url: this.form.photo}]
if (this.form.photo) {
- this.form.files = [{url: this.form.photo}]
+ this.photo = [{url: this.form.photo}] || []
+ // this.form.files = [{url: this.form.photo}]
}
+
}
})
},
diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 6d9ee480..ce1ae022 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -389,11 +389,9 @@ export default {
this.endNum = res.data.family.filter(item =>
(item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
)
- console.log(res.data.family);
this.endNum = res.data.family.filter(v=>
(v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
)
- console.log(this.endNum ,111);
}
this.info.ylbxCount = ylbxCount
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index e5a2f6c2..69ff8aeb 100644
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -495,18 +495,8 @@ export default {
methods: {
userClick(row, i) {
- if (!this.helthList[i].checked) {
- this.helthList[i].checked = true // 确定
- this.namelist.push({dictValue: row.dictValue, dictName: row.dictName}) // 赋值
- } else {
- this.helthList[i].checked = false // 取消
- this.namelist.map((item, index) => {
- if (item.dictValue == row.dictValue) {
- this.namelist.splice(index, 1)
- }
- })
- }
- this.form.healthyStatus = this.namelist.map(v => v.dictValue).join(',')
+ row.checked = !row.checked
+ this.form.healthyStatus = this.helthList.filter(e => e.checked)?.map(e => e.dictValue)?.toString()
},
// 医疗保险