Merge branch 'master' of http://139.9.163.126/gitlab/jinfeng/epidemic

pages/fillInDay/fillInDay.vue

-
 <template>
 	<view class="questionnaire">
 		<form @submit="formSubmit">
@@ -7,7 +6,7 @@
 					<view class="margin-top padding sict-label" :key="item.value" v-show="!item.hidden">
 						<view v-show="!item.hidden">
 							<span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" :style="{opacity: item.required ? 1 : 0}">*</span>
-							 {{item.label}}
+							{{item.label}}
 						</view>
 						<view class="text-right  sict-value" v-show="!item.hidden">
 							<radio-group @change="showChange($event,item)">
@@ -395,7 +394,7 @@
 						hidden: true
 					},
 					{
-						label: '症状',
+						label: '当日症状',
 						required: true,
 						value: 'symptom',
 						titleClass: 'title',
@@ -432,7 +431,7 @@
 							label: '以上均无'
 						}]
 					},
-					
+
 					{
 						label: '是否离沪',
 						required: true,
@@ -668,7 +667,38 @@
 			}
 		},
 
-		onLoad(option) {},
+		onLoad(option) {
+			// 获取信息
+			this.$http.post(`/sict-ncov/report`, this.form).then(res => {
+				console.log(res)
+			})
+			const data = {
+				currentStatus: '亲密接触者'
+			}
+			for (let k in data) {
+				const val = data[k]
+				if (val) {
+					const item = this.list.find(child => child.value == k)
+					if (item) {
+						this.showChange({
+							value: val
+						}, item)
+						if (item.type == "pickerMore") {
+							console.log(1,22)
+							item.opts.forEach(opt => {
+								val.split(',').forEach(v => {
+									if (v === opt.label) {
+										console.log(opt)
+										this.$set(opt, 'checked', true)
+									}
+								})
+							})
+
+						}
+					}
+				}
+			}
+		},
 
 
 		methods: {
@@ -710,7 +740,7 @@
 				const prop = item.value
 				const type = item.type
 				if (type === 'radio') {
-					const val = evt.target.value
+					const val = evt.value || evt.target.value
 					this.$set(this.form, prop, val)
 					for (let i = 0; i < this.list.length; i++) {
 						const current = this.list[i]
@@ -727,7 +757,7 @@
 				}
 				// 复选框展示和隐藏
 				if (type === 'pickerMore') {
-					let val = evt.detail.value;
+					let val = evt.value || evt.detail.value;
 					const showList = item.showList
 					if (showList && showList.length > 0) {
 						showList.forEach(item => {
@@ -795,11 +825,11 @@
 					this.$http.post(`/sict-ncov/report/daily`, this.form).then(res => {
 						const d = res.data
 						if (d.code == 1) {
-							
+
 							uni.navigateBack()
 							uni.showToast({
 								icon: 'success',
-								title:'提交成功'
+								title: '提交成功'
 							})
 						} else {
 							uni.showToast({