状况分开

pages/fillIn/fillIn.vue

@@ -1356,14 +1356,15 @@
 							}, {
 								value: 'g',
 								label: '无上述情况'
-						}],
+							}
+						],
 						showList: [{
 								value: 'c',
 								show: [32, 35, 38, 40, 43, 45, 47]
 							},
 
 							{
-								value: 'd',
+								value: 'd,e',
 								show: [49, 50]
 							},
 						]
@@ -1708,17 +1709,17 @@
 						this.isRead = true
 						const data = d.object.reportContent || {}
 						this.form = data
-						if(data['householdProvince']) {
+						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)
 						}
 
 						// 赋值
@@ -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
+											}
+										})
 									}
 								})
+
 							})
 						})
 

pages/fillInDay/fillInDay.vue

@@ -136,21 +136,27 @@
 								label: '亲密接触者'
 							}, {
 								value: 'd',
-							label: '居家观察/正在接受集中医学观察'
-						}, {
+								label: '居家观察'
+							},
+							{
 								value: 'e',
+								label: '正在接受集中医学观察'
+							},
+							{
+								value: 'f',
 								label: '已解除集中医学观察'
 							}, {
-							value: 'f',
+								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
+											}
+										})
 									}
 								})
+								
 							})
 						})