From 4984f4bbce4129cb6c1de32778221ebef651059f Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 10 Oct 2022 10:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppHealthReport/AddReport.vue | 98 ++++++++++--------- .../AppHealthReport/AppHealthReport.vue | 2 +- .../pingchang/AppHealthReport/UserInfo.vue | 12 +-- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/src/project/pingchang/AppHealthReport/AddReport.vue b/src/project/pingchang/AppHealthReport/AddReport.vue index b97791b..ffad4bf 100644 --- a/src/project/pingchang/AppHealthReport/AddReport.vue +++ b/src/project/pingchang/AppHealthReport/AddReport.vue @@ -48,7 +48,7 @@

14天内是否接触新冠确诊或疑似患者？

- +
@@ -59,7 +59,7 @@

当前健康状况（可多选）

- +
@@ -76,7 +76,7 @@
- {{ form.checkTime }} + {{ form.nucleicAcidDate }} 请选择
@@ -91,7 +91,7 @@

核酸检测结果

- +
@@ -102,7 +102,7 @@

健康码类型

- +
@@ -113,7 +113,7 @@

已接种疫苗次数

- +
@@ -124,7 +124,7 @@

本人健康码截图(最多9张)

- +
@@ -135,7 +135,7 @@

本人核酸检测结果截图(最多9张)

- +
@@ -162,16 +162,21 @@ export default { day: true }, form: { + reportUserId: '', name: '', idNumber: '', - checkPhoto: [], - checkResult: '', - health: '', - healthCode: '', temperature: '', - vaccine: '', - checkTime: '', - memberId: '' + contactPatients: '', + health: '', + healthList: [], + nucleicAcidDate: '', + nucleicAcidResult: '', + jkmType: '', + vaccinationCount: '', + jkmUrl: '', + jkmUrlArr: [], + nucleicAcidUrl: '', + nucleicAcidUrlArr: [], } } }, @@ -181,72 +186,71 @@ export default { ...mapState(['user']) }, + // onShow() { + // this.$dict.load(['epidemicTouchInFourteen','EP_healthType','EP_nucleicAcidResult','EP_jkmType','epidemicVaccineTime']).then(()=> {}) + // }, + onLoad(query) { - this.form.memberId = query.id - this.getInfo(query.id) + this.$dict.load(['epidemicTouchInFourteen','EP_healthType','EP_nucleicAcidResult','EP_jkmType','EP_vaccinationCount']).then(()=> { + this.form.reportUserId = query.id + this.form.name = query.name + this.form.idNumber = query.idNumber + }) }, methods: { - getInfo(id) { - this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => { - if (res.code === 0) { - this.form.name = res.data.name - this.form.idNumber = res.data.idNumber - - this.form.checkTime = res.data.checkTime ? res.data.checkTime.split(' ')[0] : '' - this.form.checkResult = res.data.checkResult || '' - this.form.healthCode = res.data.healthCode || '' - this.form.vaccine = res.data.vaccine || '' - } - - this.$hideLoading() - }).catch(() => { - this.$hideLoading() - }) - }, - onDateChange(e) { - this.form.checkTime = `${e.year}-${e.month}-${e.day}` + this.form.nucleicAcidDate = `${e.year}-${e.month}-${e.day}` }, submit() { + if (!this.form.temperature) { return this.$toast('请输入当前体温') } - if (!this.form.touchInFourteen) { + if (!this.form.contactPatients) { return this.$toast('请选择14天内是否接触新冠确诊或疑似患者') } - if (!this.form.health.length) { + if (!this.form.healthList.length) { return this.$toast('请选择当前健康状况') + } else { + this.form.health = this.form.healthList.toString() } - if (!this.form.checkTime) { + + if(!this.form.nucleicAcidDate) { return this.$toast('请选择核酸检测日期') } - if (!this.form.checkResult) { + if (!this.form.nucleicAcidResult) { return this.$toast('请选择核酸检测结果') } - if (!this.form.healthCode) { + if (!this.form.jkmType) { return this.$toast('请选择健康码类型') } - if (!this.form.vaccine) { + if (!this.form.vaccinationCount) { return this.$toast('请选择已接种疫苗次数') } - if (!this.form.checkPhoto.length) { + if (!this.form.jkmUrlArr.length) { return this.$toast('请上传健康码截图') } + + if (!this.form.nucleicAcidUrlArr.length) { + return this.$toast('请上核酸检测结果截图') + } + + this.$loading() this.$instance.post(`/app/appepidemicpreventionhealthreportinfo/addReportInfo`, { ...this.form, - openid: this.user.openid, - health: this.form.health.join(','), - checkPhoto: JSON.stringify(this.form.checkPhoto), - checkTime: this.form.checkTime + ' 00:00:00' + // openid: this.user.openid, + jkmUrl: this.form.jkmUrlArr.toString(), + nucleicAcidUrl: this.form.nucleicAcidUrlArr.toString(), + nucleicAcidDate: this.form.nucleicAcidDate + ' 00:00:00' }).then(res => { if (res.code == 0) { uni.$emit('update') diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue index 426cd18..a12474f 100644 --- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue +++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue @@ -24,7 +24,7 @@ 天
+ @click.stop="$linkTo(`./AddReport?id=${item.id}&name=${item.name}&idNumber=${item.idNumber}`)"> 今日未上报
diff --git a/src/project/pingchang/AppHealthReport/UserInfo.vue b/src/project/pingchang/AppHealthReport/UserInfo.vue index f7a4cb0..fc7ff19 100644 --- a/src/project/pingchang/AppHealthReport/UserInfo.vue +++ b/src/project/pingchang/AppHealthReport/UserInfo.vue @@ -61,7 +61,7 @@ data () { return { info: {}, - pageShow: false + pageShow: true, } }, @@ -72,15 +72,15 @@ methods: { getInfo (id) { - this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => { - if (res.code === 0) { + this.$instance.post(`/app/appepidemicpreventionhealthreportinfo/list?reportUserId=${id}`).then(res => { + if (res.code == 0) { this.info = res.data if (res.data.eventStatus > 1) { this.result = res.data.processList[0] } - this.$nextTick(() => { - this.pageShow = true - }) + // this.$nextTick(() => { + // this.pageShow = true + // }) } this.$hideLoading()