From 2e73b5af1d89f36e417c755ca7950f754ddbfd25 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 29 Mar 2022 14:34:50 +0800 Subject: [PATCH 01/14] bug --- src/apps/AppWarningMonitoring/detail.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue index 38806579..651e7766 100644 --- a/src/apps/AppWarningMonitoring/detail.vue +++ b/src/apps/AppWarningMonitoring/detail.vue @@ -17,6 +17,7 @@
+
@@ -126,12 +127,10 @@
走访核实 -
-
- - 处理结果 +
+ 处理结果
From 4d660f8d11c244b106e17e836852429a5f064373 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 29 Mar 2022 14:37:34 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppWarningMonitoring/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue index 651e7766..89bf516d 100644 --- a/src/apps/AppWarningMonitoring/detail.vue +++ b/src/apps/AppWarningMonitoring/detail.vue @@ -130,7 +130,7 @@
- 处理结果 + 处理结果
From 0acff93d88acdffe84e911f997108526c7f9931d Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 14:44:14 +0800 Subject: [PATCH 03/14] 28619 --- src/apps/AppMonitoringObject/Detail.vue | 2 +- .../AppMonitoringObject/MonitorAddLog.vue | 26 +++++++++++++------ .../AppPageRevitalize/AppPageRevitalize.vue | 8 +++--- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 37367a8a..c92b90ff 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -192,7 +192,7 @@
{{ item.createTime }} - +

{{ item.detail }}

diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 1d5f9921..bc208849 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/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: '生态振兴', From bee61dbc1e69410dd03ddf60bf20c95deda90a73 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 14:45:09 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B8=AE=E6=89=B6?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/MonitorAddLog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index bc208849..6e5b50b8 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -40,7 +40,7 @@ export default { } }, onShow() { - document.title = this.id ? '添加帮扶日志' : '编辑帮扶日志' + document.title = this.id ? '编辑帮扶日志' : '添加帮扶日志' }, methods: { getInfo() { From f1b0e36b8edc72de9203d2726206f2331fcaae63 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 14:47:20 +0800 Subject: [PATCH 05/14] 28636 --- src/apps/AppMonitoringObject/Add.vue | 2 ++ src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index cb28fe86..9aa00df5 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -371,6 +371,8 @@ export default { delta: 1 }) } + }).catch((err) => { + this.$u.toast(err) }) }, diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index be59fedf..93abc8bc 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -392,6 +392,8 @@ export default { delta: 1 }) } + }).catch((err) => { + this.$u.toast(err) }) }, From 46e76159e856e1d0ce074bc5c2665983aaf87b76 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 14:51:04 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/Add.vue | 2 ++ src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 9aa00df5..83780fec 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -295,6 +295,7 @@ export default { girdName: '', healthyStatus: '', age: '', + birthday: '', }, $areaId: '', isEdit: false, @@ -405,6 +406,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/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 93abc8bc..b0b1e07c 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -294,6 +294,7 @@ export default { girdId: '', girdName: '', healthyStatus: '', + birthday: '', }, id: '', $areaId: '', @@ -412,6 +413,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(); From 488d0de5c29a2d9457bfba242cd15dbad80d26df Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:17:47 +0800 Subject: [PATCH 07/14] 28639 --- src/apps/AppMonitoringObject/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index c92b90ff..34defbb2 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -305,7 +305,7 @@ export default { this.id = query.id }, onShow() { - document.title = '居民详情' + document.title = '监测对象详情' uni.$on('reload', () => { this.getInfo() }) From e7a644e6b1755b1390ec7f4f1717108ca2778957 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:22:36 +0800 Subject: [PATCH 08/14] 28640 --- src/apps/AppMonitoringObject/List.vue | 1 - 1 file changed, 1 deletion(-) 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; From b3ea80702583b45f663147bf15a0e2f06111d855 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:30:14 +0800 Subject: [PATCH 09/14] =?UTF-8?q?28641ui=E7=B1=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/Add.vue | 22 +++++++++---------- .../MonitorAddFamilyMember.vue | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 83780fec..407d78bb 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -78,6 +78,17 @@ +
+
+
+ * + 详细地址 +
+
+ +
+
+
@@ -113,17 +124,6 @@
-
-
-
- * - 详细地址 -
-
- -
-
-
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index b0b1e07c..95f72296 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -78,6 +78,17 @@
+
+
+
+ * + 详细地址 +
+
+ +
+
+
@@ -113,17 +124,6 @@
-
-
-
- * - 详细地址 -
-
- -
-
-
From aab8ccb21cfcf91157daa943f1546d80020c2378 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:35:26 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/MonitorFamilyMember.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue index 6cdd6c63..545ac30a 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue @@ -7,7 +7,7 @@

{{ item.name }}

{{ item.idNumber }}
- {{ $dict.getLabel('fpRelationship', item.relationship) }} + {{ $dict.getLabel('fpRelationship', item.householdRelation) }}
{{ $dict.getLabel('sex', item.sex) }} From b4d1ae21303cb96fdbc4c87b8ccdc995bff29818 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:41:39 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=88=B7=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 95f72296..23baa5f7 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -295,6 +295,7 @@ export default { girdName: '', healthyStatus: '', birthday: '', + isHousehold: '', }, id: '', $areaId: '', @@ -382,6 +383,7 @@ export default { this.form.girdName = this.girdInfo.girdName this.form.householdIdNumber = this.householdIdNumber this.form.objectType = this.objectType + this.form.isHousehold = 1 this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, id: this.id || '' From 49c3afcff84ce92e5831809a95fff7db07794f72 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 15:47:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/Detail.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 34defbb2..a3ce4e07 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -223,6 +223,10 @@
驳回申请
纳入监测
+ From 5fd52a650a28431b8364ad0591e5a3f7d54e9144 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 16:14:21 +0800 Subject: [PATCH 13/14] 28642 --- src/apps/AppMonitoringObject/MonitorFamilyMember.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue index 545ac30a..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.householdRelation) }} + 户主 + {{ $dict.getLabel('fpRelationship', item.householdRelation) }}
{{ $dict.getLabel('sex', item.sex) }} From 0a66569d4e46a341b68c1f354666358c7f35dba6 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 29 Mar 2022 16:29:01 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=88=B7=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppMonitoringObject/Add.vue | 2 ++ src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 407d78bb..dfb4d3af 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -296,6 +296,7 @@ export default { healthyStatus: '', age: '', birthday: '', + isHousehold: '' }, $areaId: '', isEdit: false, @@ -361,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 : '' diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 23baa5f7..40ef9a40 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -383,7 +383,7 @@ export default { this.form.girdName = this.girdInfo.girdName this.form.householdIdNumber = this.householdIdNumber this.form.objectType = this.objectType - this.form.isHousehold = 1 + this.form.isHousehold = 0 this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, id: this.id || ''