diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index cb28fe86..dfb4d3af 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -78,6 +78,17 @@ +
+
+
+ * + 详细地址 +
+
+ +
+
+
@@ -113,17 +124,6 @@
-
-
-
- * - 详细地址 -
-
- -
-
-
@@ -295,6 +295,8 @@ export default { girdName: '', healthyStatus: '', age: '', + birthday: '', + isHousehold: '' }, $areaId: '', isEdit: false, @@ -360,6 +362,7 @@ export default { this.form.girdName = this.girdInfo.girdName this.form.householdIdNumber = this.form.idNumber this.form.householdRelation = '01' + this.form.isHousehold = 1 this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, id: this.isEdit ? this.id : '' @@ -371,6 +374,8 @@ export default { delta: 1 }) } + }).catch((err) => { + this.$u.toast(err) }) }, @@ -403,6 +408,7 @@ export default { } var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber) this.form.sex = info.gender + this.form.birthDate = info.birthday var myDate = new Date(); var month = myDate.getMonth() + 1; var day = myDate.getDate(); diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 37367a8a..a3ce4e07 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -192,7 +192,7 @@
{{ item.createTime }} - +

{{ item.detail }}

@@ -223,6 +223,10 @@
驳回申请
纳入监测
+ @@ -305,7 +308,7 @@ export default { this.id = query.id }, onShow() { - document.title = '居民详情' + document.title = '监测对象详情' uni.$on('reload', () => { this.getInfo() }) diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue index 4fd6a1ef..c2823094 100644 --- a/src/apps/AppMonitoringObject/List.vue +++ b/src/apps/AppMonitoringObject/List.vue @@ -302,7 +302,6 @@ export default { .right-bottom { p{ - height: 36px; font-size: 26px; font-family: PingFangSC-Regular, PingFang SC; color: #999; diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index be59fedf..40ef9a40 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -78,6 +78,17 @@ +
+
+
+ * + 详细地址 +
+
+ +
+
+
@@ -113,17 +124,6 @@
-
-
-
- * - 详细地址 -
-
- -
-
-
@@ -294,6 +294,8 @@ export default { girdId: '', girdName: '', healthyStatus: '', + birthday: '', + isHousehold: '', }, id: '', $areaId: '', @@ -381,6 +383,7 @@ export default { this.form.girdName = this.girdInfo.girdName this.form.householdIdNumber = this.householdIdNumber this.form.objectType = this.objectType + this.form.isHousehold = 0 this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, id: this.id || '' @@ -392,6 +395,8 @@ export default { delta: 1 }) } + }).catch((err) => { + this.$u.toast(err) }) }, @@ -410,6 +415,7 @@ export default { } var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber) this.form.sex = info.gender + this.form.birthDate = info.birthday var myDate = new Date(); var month = myDate.getMonth() + 1; var day = myDate.getDate(); diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 1d5f9921..6e5b50b8 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -28,20 +28,29 @@ export default { return { detail: '', pid: '', - files: [] + files: [], + id: '' } }, - - onShow() { - document.title = '添加帮扶日志' - }, - onLoad(query) { this.pid = query.pid + if(query.id) { + this.id = query.id + this.getInfo() + } + }, + onShow() { + document.title = this.id ? '编辑帮扶日志' : '添加帮扶日志' }, - methods: { - + getInfo() { + this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${this.id}`).then(res => { + if (res.code == 0) { + this.detail = res.data.detail + this.files = res.data.files || [] + } + }) + }, submit() { if (!this.detail) { return this.$u.toast('请输入帮扶内容') @@ -50,6 +59,7 @@ export default { detail: this.detail, files: this.files, pid: this.pid, + id: this.id }).then(res => { if (res.code === 0) { this.$u.toast('提交成功') diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue index 6cdd6c63..bb14aecb 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue @@ -7,7 +7,8 @@

{{ item.name }}

{{ item.idNumber }}
- {{ $dict.getLabel('fpRelationship', item.relationship) }} + 户主 + {{ $dict.getLabel('fpRelationship', item.householdRelation) }}
{{ $dict.getLabel('sex', item.sex) }} diff --git a/src/apps/AppPageRevitalize/AppPageRevitalize.vue b/src/apps/AppPageRevitalize/AppPageRevitalize.vue index 706a1c7c..083b37be 100644 --- a/src/apps/AppPageRevitalize/AppPageRevitalize.vue +++ b/src/apps/AppPageRevitalize/AppPageRevitalize.vue @@ -15,22 +15,22 @@ export default { { name: '产业振兴', icon: require('./img/cyzx.png'), - url: '../AppServicePublic/AppServicePublic?moduleId=c7d4e2c46b56477c9a581af7f16e10d9&listName=产业资讯' + url: '../AppServicePublic/AppServicePublic?moduleId=c7d4e2c46b56477c9a581af7f16e10d9&listName=产业振兴' }, { name: '组织振兴', icon: require('./img/zzzx.png'), - url: '../AppServicePublic/AppServicePublic?moduleId=a33a855416d44b77a006b93599c9618d&listName=组织动态' + url: '../AppServicePublic/AppServicePublic?moduleId=a33a855416d44b77a006b93599c9618d&listName=组织振兴' }, { name: '人才振兴', icon: require('./img/rczx.png'), - url: '../AppServicePublic/AppServicePublic?moduleId=6aa884de2b814967bdbb18a363904083&listName=人才工作' + url: '../AppServicePublic/AppServicePublic?moduleId=6aa884de2b814967bdbb18a363904083&listName=人才振兴' }, { name: '文化振兴', icon: require('./img/whzx.png'), - url: '../AppServicePublic/AppServicePublic?moduleId=feaf0264251f422db9b10c5e9f6c1c56&listName=生态建设' + url: '../AppServicePublic/AppServicePublic?moduleId=feaf0264251f422db9b10c5e9f6c1c56&listName=文化振兴' }, { name: '生态振兴', diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue index 38806579..89bf516d 100644 --- a/src/apps/AppWarningMonitoring/detail.vue +++ b/src/apps/AppWarningMonitoring/detail.vue @@ -17,6 +17,7 @@
+
@@ -126,12 +127,10 @@
走访核实 -
-
- - 处理结果 +
+ 处理结果