diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue index 82619b132ea0153c4f9f60834873d1bb23f6787c..f79845ff9bcacee4fe19a54fd794a0dd85d7b832 100644 --- a/pages/fillIn/fillIn.vue +++ b/pages/fillIn/fillIn.vue @@ -138,7 +138,7 @@

根据《中华人民共和国传染病防治法》、《中华人民共和国突发事件应对法》、《突发公共卫生事件应急条例》、国家卫生健康委员会公告(2020年第1号),并按照国务院常务会议提出的“分类有序复工复产”和上海疫情防控办及市政府《关于进一步落实各项疫情防控措施的通告》的相关要求,为做好新型冠状病毒感染的肺炎疫情防控工作,保障广大人民群众生命健康,现面向使用本系统的所有用户,特告知如下:所填信息须真实、有效,如若有任何瞒报情况,将依法追究法律责任,并被有关部门列为失信人员。本系统采集的用户信息,主要用于园区和企业的防控管理,必要时将与有关政府部门进行信息对接,或在去除个人隐私信息后用于疫情相关的科学研究。:

 

- +

用户本人承诺:我已经认真阅读过,或者已经有人详细读给我听了。我理解其中的信息,我愿意接受检查,保证填报信息真实、有效,同意相关人员按照这份知情同意书的描述使用本人信息。

@@ -1334,36 +1334,37 @@ titleClass: 'title', type: 'pickerMore', opts: [{ - value: 'a', - label: '已经确诊' - }, { - value: 'b', - label: '疑似诊断' - }, { - value: 'c', - label: '亲密接触者' - }, { - value: 'd', - label: '居家观察' - }, - { - value: 'e', - label: '正在接受集中医学观察' - }, - { - value: 'f', - label: '已解除集中医学观察' - }, { - value: 'g', - label: '无上述情况' - }], + value: 'a', + label: '已经确诊' + }, { + value: 'b', + label: '疑似诊断' + }, { + value: 'c', + label: '亲密接触者' + }, { + value: 'd', + label: '居家观察' + }, + { + value: 'e', + label: '正在接受集中医学观察' + }, + { + value: 'f', + label: '已解除集中医学观察' + }, { + value: 'g', + label: '无上述情况' + } + ], showList: [{ value: 'c', show: [32, 35, 38, 40, 43, 45, 47] }, { - value: 'd', + value: 'd,e', show: [49, 50] }, ] @@ -1708,19 +1709,19 @@ this.isRead = true const data = d.object.reportContent || {} this.form = data - if(data['householdProvince']) { - const val = data['householdProvince'] + "," + data['householdCity'] + "," + data[ + if (data['householdProvince']) { + const val = data['householdProvince'] + "," + data['householdCity'] + "," + data[ 'householdDistrict'] - - this.$set(this.form,'householdValues',val ) - + + this.$set(this.form, 'householdValues', val) + } - if(data['residenceProvince']) { + if (data['residenceProvince']) { const val = data['residenceProvince'] + "," + data['residenceCity'] + "," + data[ 'residenceDistrict'] - this.$set(this.form,'residenceValue',val ) + this.$set(this.form, 'residenceValue', val) } - + // 赋值 for (let k in data) { const val = data[k] @@ -1822,9 +1823,19 @@ item.show.forEach(child => { this.list.forEach(row => { if (child == row.num) { - this.$set(row, 'hidden', !val.includes(item.value)) + item.value.split(',').some(v => { + if (val.includes(v)) { + this.$set(row, 'hidden', false) + return true + console.log(child) + } else { + this.$set(row, 'hidden', true) + return false + } + }) } }) + }) }) @@ -1962,7 +1973,7 @@ const d = res.data if (d.code == 1) { uni.reLaunch({ - url: '/pages/index/index', + url: '/pages/index/index', }); uni.showToast({ icon: 'success', diff --git a/pages/fillInDay/fillInDay.vue b/pages/fillInDay/fillInDay.vue index 2c14af3f4bbc3cbde40cbb0f6ba5a42c5058feb9..8094f92baa0540417739084bf12a4d6f71628ee5 100644 --- a/pages/fillInDay/fillInDay.vue +++ b/pages/fillInDay/fillInDay.vue @@ -126,31 +126,37 @@ titleClass: 'title', type: 'pickerMore', opts: [{ - value: 'a', - label: '已经确诊' - }, { - value: 'b', - label: '疑似诊断' - }, { - value: 'c', - label: '亲密接触者' - }, { - value: 'd', - label: '居家观察/正在接受集中医学观察' - }, { - value: 'e', - label: '已解除集中医学观察' - }, { - value: 'f', - label: '无上述情况' - }], + value: 'a', + label: '已经确诊' + }, { + value: 'b', + label: '疑似诊断' + }, { + value: 'c', + label: '亲密接触者' + }, { + value: 'd', + label: '居家观察' + }, + { + value: 'e', + label: '正在接受集中医学观察' + }, + { + value: 'f', + label: '已解除集中医学观察' + }, { + value: 'g', + label: '无上述情况' + } + ], showList: [{ value: 'c', show: [32, 35, 38, 40, 43, 45, 47] }, { - value: 'd', + value: 'd,e', show: [49, 50] }, ] @@ -774,11 +780,22 @@ if (showList && showList.length > 0) { showList.forEach(item => { item.show.forEach(child => { + this.list.forEach(row => { if (child == row.num) { - this.$set(row, 'hidden', !val.includes(item.value)) + item.value.split(',').some( v =>{ + if(val.includes(v)) { + this.$set(row, 'hidden', false) + return true + console.log(child) + }else { + this.$set(row, 'hidden', true) + return false + } + }) } }) + }) }) @@ -863,7 +880,7 @@ const d = res.data if (d.code == 1) { uni.reLaunch({ - url: '/pages/index/index', + url: '/pages/index/index', }); uni.showToast({ icon: 'success',