From e82205d36c506ef8a70503f48854debfdc44e6ce Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 09:15:04 +0800 Subject: [PATCH 01/15] 29307 --- src/apps/AppMonitoringObject/Detail.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 9c88f882..3891e28c 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -159,7 +159,7 @@

收支情况

({{ isIncome ? '已填写' : '未填写' }}) - 编辑 + 编辑
@@ -436,10 +436,8 @@ export default { }, toAddView(text, pass) { - // console.log(111); this.$confirm('', text).then(() => { uni.navigateTo({url: `./MonitorAddView?pass=${pass}&id=${this.info.id}&status=${this.info.status}`}) - // console.log(222); // this.$http.post(`/app/apppreventionreturntopoverty/examine?id=${this.id}&pass=${pass}`).then(res => { // if (res.code === 0) { // this.$u.toast('操作成功') From c340cdbe2ff337efe55f7933f1a1127332f23caa Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 09:26:58 +0800 Subject: [PATCH 02/15] 29309 --- src/apps/AppMonitoringObject/Detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 3891e28c..df678b21 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -16,7 +16,8 @@

{{ info.phone }}

- 编辑 + + 编辑
From 0451b009d659712f3e544dfa3d05190d4453c4e2 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 09:36:34 +0800 Subject: [PATCH 03/15] 29314 --- src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue index 40ef9a40..3f666d21 100644 --- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue @@ -432,6 +432,7 @@ export default { From 8431e7e283cddcfce7e1d2855a4a6dafcd3623d7 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 10:08:42 +0800 Subject: [PATCH 04/15] 29320 --- src/apps/AppMonitoringObject/Add.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 59b8e8ad..27f312cd 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -16,17 +16,20 @@
- +
@@ -422,8 +425,8 @@ export default { if (this.form.phone.length == 11 && !regTel.test(this.form.phone)) { return this.$u.toast('请输入正确的手机号') } - if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) { - return this.$u.toast('现住址必须选到村级') + if(!/[^0]0{6,7}$/.test(this.form.currentAreaId)) { + return this.$u.toast('现住址必须选到县级') } if(this.form.files.length) { From 4b5dc3e42f657ad7c36a2a74bf07bc71601e1c98 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 10:17:50 +0800 Subject: [PATCH 05/15] 29326 --- src/apps/AppMonitoringObject/Add.vue | 5 ----- src/apps/AppMonitoringObject/MonitorAddLog.vue | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 27f312cd..73a41d48 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -386,11 +386,6 @@ export default { }, methods: { - toSelect() { - // uni.navigateTo({ - // url: './residentList' - // }) - }, rules() { return { objectType: '请选择监测对象类型', diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 05439fc7..80337646 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -36,6 +36,7 @@ export default { id: '', type: '', operationDesc: '', + flag: false, } }, onLoad(query) { @@ -65,12 +66,14 @@ export default { }) }, submit() { + if(this.flag) return if (!this.operationDesc) { return this.$u.toast('请选择帮扶类型') } if (!this.detail) { return this.$u.toast('请输入帮扶内容') } + this.flag = true this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', { detail: this.detail, files: this.files, From f4b3956e3ef4acdb800b3c86c271d19fbb296536 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 10:19:43 +0800 Subject: [PATCH 06/15] 29328 --- src/apps/AppMonitoringObject/MonitorAddLog.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 80337646..15dc5d03 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -60,6 +60,7 @@ export default { getInfo() { this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${this.id}`).then(res => { if (res.code == 0) { + this.operationDesc = res.data.operationDesc this.detail = res.data.detail this.files = res.data.files || [] } From f5b0861af25d22bee1fdb20e8638f41c9981827b Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 10:22:21 +0800 Subject: [PATCH 07/15] 29329 --- 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 bb14aecb..7a36b96d 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue @@ -5,7 +5,7 @@

{{ item.name }}

- {{ item.idNumber }} + {{ item.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}
户主 {{ $dict.getLabel('fpRelationship', item.householdRelation) }} From d78c49aff426ee260862097c6c9ec4cb002a96e3 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 11:27:00 +0800 Subject: [PATCH 08/15] 29334 --- src/apps/AppMonitoringObject/Add.vue | 45 ++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 73a41d48..3f3ca902 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -23,8 +23,9 @@ 选择户主
- - 请选择 + + 请选择 + {{ userList[0].name }}
@@ -86,7 +87,7 @@ 现住址
- +
{{ form.currentAreaName }} 请选择 @@ -159,7 +160,7 @@
-
+
@@ -219,7 +220,7 @@ -
+
@@ -292,7 +293,7 @@
-

*备注说明

+

备注说明

@@ -359,11 +360,28 @@ export default { isEdit: false, id: '', girdInfo: {}, - photo: [] + photo: [], + userList: [], + flag:false, } }, computed: { ...mapState(['user']), + + userChange() { + if(this.userList.length) { + this.isEdit = true; + this.form.name = this.userList[0].name + this.form.idNumber = this.userList[0].idNumber + return [this.isEdit,this.form.name,this.form.idNumber] + } + }, + sexChange() { + if(this.form.idNumber) { + return this.form.sex = this.form.idNumber.substr(16, 1) % 2 == 0 ? '1' : '0' + } + } + }, onLoad(query) { @@ -420,8 +438,8 @@ export default { if (this.form.phone.length == 11 && !regTel.test(this.form.phone)) { return this.$u.toast('请输入正确的手机号') } - if(!/[^0]0{6,7}$/.test(this.form.currentAreaId)) { - return this.$u.toast('现住址必须选到县级') + if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) { + return this.$u.toast('现住址必须选到村级') } if(this.form.files.length) { @@ -444,9 +462,9 @@ export default { return this.$u.toast('请选择风险因素') } - if(!this.form.detail) { - return this.$u.toast('请输入备注说明') - } + // if(!this.form.detail) { + // return this.$u.toast('请输入备注说明') + // } this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, @@ -725,5 +743,8 @@ export default { .border-b0{ border-bottom: 0!important; } + ::v-deep .AiSelect .display .selectedLabel { + font-size: 28px; + } } From 95ddb550e7e0e9e3244a6934ea2a75cf31c4c9dd Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 12:43:48 +0800 Subject: [PATCH 09/15] 29319 --- src/apps/AppMonitoringObject/Add.vue | 51 +++++++++++-------- .../AppMonitoringObject/MonitorAddView.vue | 8 +-- .../AppMonitoringObject/MonitorRemoveView.vue | 4 +- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 3f3ca902..0d7fe903 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -87,7 +87,8 @@ 现住址
- + +
{{ form.currentAreaName }} 请选择 @@ -173,13 +174,23 @@
-
+
* 健康状况
- + + + + {{ e.dictName }} + +
@@ -362,7 +373,8 @@ export default { girdInfo: {}, photo: [], userList: [], - flag:false, + flag: false, + helthList: [], } }, computed: { @@ -389,13 +401,21 @@ export default { this.$dict.load(['fpType','fpRiskType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth', 'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => { if (query.id) { - this.isEdit = true + this.flag = true this.id = query.id this.getInfo(this.id) }else { this.form.currentAreaId = this.user.areaId } }) + // var dictList = [] + // console.log(this.$dict.getDict('fpHealth')); + // this.$dict.getDict('fpHealth').map((item) => { + // dictList.push(item.dictValue) + // }) + // return helthList = dictList.join(',') + // console.log(dictList.join(',')); + }, @@ -414,12 +434,6 @@ export default { } }, - getResidentList() { - this.$http.post('').then(res => { - - }) - }, - getResidentList() { uni.navigateTo({ url: './residentList' @@ -461,10 +475,6 @@ export default { if(!this.form.riskType) { return this.$u.toast('请选择风险因素') } - - // if(!this.form.detail) { - // return this.$u.toast('请输入备注说明') - // } this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, @@ -589,6 +599,11 @@ export default { border-bottom: 1px solid #E4E5E6; } + .checkbox { + display: flex; + + } + .right { height: 112px; line-height: 112px; @@ -653,12 +668,6 @@ export default { font-size: 32px; } } - - // &:last-child { - // .form-item__wrapper { - // border: none; - // } - // } } } diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue index 56a8cc89..e0fdd631 100644 --- a/src/apps/AppMonitoringObject/MonitorAddView.vue +++ b/src/apps/AppMonitoringObject/MonitorAddView.vue @@ -74,7 +74,7 @@ export default { this.filesList = files.join(',') } - if(this.status == 0) { + if(this.status == 0) { // 纳入监测 this.$http.post(`/app/apppreventionreturntopoverty/examine`, null,{ params: { pass: this.pass, @@ -85,7 +85,7 @@ export default { } }).then(res => { if (res.code === 0) { - this.$u.toast('操作成功') + this.$u.toast('提交成功') uni.$emit('reload') setTimeout(() => { uni.navigateBack({ @@ -94,7 +94,7 @@ export default { },600) } }) - } else { + } else { // 驳回 this.$http.post(`/app/apppreventionreturntopoverty/relieve`, null,{ params: { pass: this.pass, @@ -105,7 +105,7 @@ export default { } }).then(res => { if (res.code === 0) { - this.$u.toast('操作成功') + this.$u.toast('提交成功') uni.$emit('reload') setTimeout(() => { uni.navigateBack({ diff --git a/src/apps/AppMonitoringObject/MonitorRemoveView.vue b/src/apps/AppMonitoringObject/MonitorRemoveView.vue index 33265e76..47767915 100644 --- a/src/apps/AppMonitoringObject/MonitorRemoveView.vue +++ b/src/apps/AppMonitoringObject/MonitorRemoveView.vue @@ -123,7 +123,7 @@ export default { } }).then(res => { if (res.code === 0) { - this.$u.toast('操作成功') + this.$u.toast('提交成功') uni.$emit('reload') setTimeout(() =>{ uni.navigateBack({ @@ -140,7 +140,7 @@ export default { } }).then(res => { if (res.code === 0) { - this.$u.toast('操作成功') + this.$u.toast('提交成功') uni.$emit('reload') setTimeout(() =>{ uni.navigateBack({ From 4d96a57fba9daccee5b806f591ff700b009265a1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 27 Apr 2022 12:52:14 +0800 Subject: [PATCH 10/15] 29322 --- src/apps/AppMonitoringObject/MonitorAddLog.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 15dc5d03..1c68cfc9 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -102,21 +102,20 @@ export default {