diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index ee07b33221b0b40892076efde36bdac4d20e4dd9..c61e8f75cffa3d87c5da3b5dbf27e56e0b39e951 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="questionnaire">
-		<form @submit="formSubmit" >
+		<form @submit="formSubmit">
 			<template v-for="(item,index) in list">
-				<view v-if="item.type == 'radio'" class="margin-top padding sict-label"  :key="item.value">
+				<view v-if="item.type == 'radio'" class="margin-top padding sict-label" :key="item.value">
 					<view v-show="!item.hidden">
 						<span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="item.required">*</span>
 						{{index+1}}、 {{item.label}}
@@ -19,9 +19,10 @@
 						</radio-group>
 					</view>
 				</view>
-				<template  v-else-if="item.type == 'picker'">
-					<view class="cu-form-group margin-top padding-rl"  v-show="!item.hidden" :key="item.value">
-						<view :class="item.titleClass"><span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="item.required">*</span>{{index+1}}、{{item.label}}</view>
+				<template v-else-if="item.type == 'picker'">
+					<view class="cu-form-group margin-top padding-rl" v-show="!item.hidden" :key="item.value">
+						<view :class="item.titleClass"><span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx"
+							 v-if="item.required">*</span>{{index+1}}、{{item.label}}</view>
 						<picker @change="updatePickerVal($event,item.value)" range-key="label" :value="form[item.value]" :range="item.opts">
 							<view class="picker">
 								{{form[item.value]>-1?item.opts[form[item.value]].label:'请选择'}}
@@ -29,8 +30,8 @@
 						</picker>
 					</view>
 				</template>
-				
-				<template  v-else-if="item.type == 'pickerMore'">
+
+				<template v-else-if="item.type == 'pickerMore'">
 					<view class="margin-top" :key="index">
 						<uni-collapse>
 							<uni-collapse-item :title="index+1 +'、' + item.label" :open="true" :required="item.required">
@@ -53,10 +54,11 @@
 						</uni-collapse>
 					</view>
 				</template>
-				
-				<template  v-else-if="item.type == 'date'">
-					<view class="cu-form-group margin-top padding-rl" v-show="!item.hidden"  :key="item.value">
-						<view :class="item.titleClass"><span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="item.required">*</span>{{index+1}}、{{item.label}}</view>
+
+				<template v-else-if="item.type == 'date'">
+					<view class="cu-form-group margin-top padding-rl" v-show="!item.hidden" :key="item.value">
+						<view :class="item.titleClass"><span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx"
+							 v-if="item.required">*</span>{{index+1}}、{{item.label}}</view>
 						<picker mode="date" :value="date" start="2015-09-01" end="2020-09-01" @change="updatePickerVal($event,item.value)">
 							<view class="picker">
 								{{form[item.value]>-1?item.opts[form[item.value]].label:'请选择'}}
@@ -64,32 +66,36 @@
 						</picker>
 					</view>
 				</template>
-				<template  v-else-if="item.type == 'input'" >
+				<template v-else-if="item.type == 'input'">
 					<view class="cu-form-group margin-top padding-rl" :key="item.value">
 						<view :class="item.titleClass">
 							<span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="item.required">*</span>
-						{{index+1}}、{{item.label}}</view>
-						<input  class="text-right" :placeholder="item.placeholder" :type="item.controType" :value="form[item.value]" name="input" @input="updateInputVal($event,item.value)"></input>
+							{{index+1}}、{{item.label}}</view>
+						<input class="text-right" :placeholder="item.placeholder" :type="item.controType" :value="form[item.value]" name="input"
+						 @input="updateInputVal($event,item.value)"></input>
 					</view>
 				</template>
 				<view class="margin-top-xs" v-show="item.child && childItem.show" v-for="(childItem,childIndex) in item.child" :key="childItem.value">
-						<view class="margin-top-sm padding-rl sict-label cu-form-group">
-							<view>
-								<span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="childItem.required">*</span>
-								{{childItem.title}}
-							</view>
-							<checkbox  v-if="childItem.type == 'radio'" :class="form[childItem.value]?'checked':''" :checked="form[childItem.value]?true:false" :value="childItem.value"></checkbox>
-							
-							<picker v-else-if="childItem.type == 'picker'" range-key="label"  @change="updatePickerVal($event,childItem.value)" :value="form[childItem.value]" :range="childItem.opts">
-								<view class="picker">
-									{{form[childItem.value]>-1?childItem.opts[form[childItem.value]].label:'请选择'}}
-								</view>
-							</picker>
-							<input  class="text-right" v-else-if="childItem.type == 'input'" :type="childItem.controType" :placeholder="childItem.placeholder" :value="form[childItem.value]" name="input" @input="updateInputVal($event,childItem.value)"></input>
+					<view class="margin-top-sm padding-rl sict-label cu-form-group">
+						<view>
+							<span style="color:red;display: inline-block; vertical-align:inherit;margin-right:4upx" v-if="childItem.required">*</span>
+							{{childItem.title}}
 						</view>
+						<checkbox v-if="childItem.type == 'radio'" :class="form[childItem.value]?'checked':''" :checked="form[childItem.value]?true:false"
+						 :value="childItem.value"></checkbox>
+
+						<picker v-else-if="childItem.type == 'picker'" range-key="label" @change="updatePickerVal($event,childItem.value)"
+						 :value="form[childItem.value]" :range="childItem.opts">
+							<view class="picker">
+								{{form[childItem.value]>-1?childItem.opts[form[childItem.value]].label:'请选择'}}
+							</view>
+						</picker>
+						<input class="text-right" v-else-if="childItem.type == 'input'" :type="childItem.controType" :placeholder="childItem.placeholder"
+						 :value="form[childItem.value]" name="input" @input="updateInputVal($event,childItem.value)"></input>
+					</view>
 				</view>
 			</template>
-			
+
 			<view class="cu-form-group margin-top-sm">
 				<view class="uni-padding-wrap uni-common-mt">
 					<view class="padding-top padding-bottom">
@@ -105,7 +111,7 @@
 				</view>
 				</checkbox-group>
 			</view>
-			
+
 			<view class="cu-modal" :class="modalName=='Modal'?'show':''">
 				<view class="cu-dialog">
 					<view class="cu-bar bg-white justify-end text-bold">
@@ -154,478 +160,1535 @@
 		},
 		data() {
 			return {
-				modalName:'',
-				id:'',
-				radio:[],
-				shanghaiList:[
+				modalName: '',
+				id: '',
+				radio: [],
+				shanghaiList: [{
+						label: '是否离沪',
+						required: true,
+						value: 'left',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}]
+					},
 					{
-						label:'是否离沪',
-						required:true,
-						value:'left',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}]
-					},
+						label: '离沪原因',
+						required: true,
+						value: 'leftReason',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '探亲'
+						}, {
+							value: 'b',
+							label: '出差'
+						}, {
+							value: 'b',
+							label: '旅游'
+						}, {
+							value: 'b',
+							label: '其他'
+						}]
+					},
 					{
-						label:'离沪原因',
-						required:true,
-						value:'leftReason',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'探亲'},{value:'b',label:'出差'},{value:'b',label:'旅游'},{value:'b',label:'其他'}]
-					},
+						label: '离沪出发日期',
+						required: true,
+						value: 'leftDate',
+						titleClass: 'title',
+						type: 'date',
+					},
 					{
-						label:'离沪出发日期',
-						required:true,
-						value:'leftDate',
-						titleClass:'title',
-						type:'date',
+						label: '离沪方式',
+						required: true,
+						value: 'leftVehicle',
+						titleClass: 'title',
+						type: 'date',
+						opts: [{
+							value: 'a',
+							label: '火车	'
+						}, {
+							value: '飞机',
+							label: '否'
+						}, {
+							value: '客车',
+							label: '否'
+						}, {
+							value: '自驾',
+							label: '否'
+						}]
 					},
 					{
-						label:'离沪方式',
-						required:true,
-						value:'leftVehicle',
-						titleClass:'title',
-						type:'date',
-						opts:[{value:'a',label:'火车	'},{value:'飞机',label:'否'},{value:'客车',label:'否'},{value:'自驾',label:'否'}]
+						label: '离沪车次/航班',
+						required: true,
+						value: 'leftVehicleNum',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'离沪车次/航班',
-						required:true,
-						value:'leftVehicleNum',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '离沪到达日期',
+						required: true,
+						value: 'leftReachDate',
+						titleClass: 'title',
+						type: 'date',
 					},
 					{
-						label:'离沪到达日期',
-						required:true,
-						value:'leftReachDate',
-						titleClass:'title',
-						type:'date',
+						label: '离沪目的地',
+						required: true,
+						value: 'leftTarget',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'离沪目的地',
-						required:true,
-						value:'leftTarget',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '离沪具体地址',
+						required: true,
+						value: 'leftAddress',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'离沪具体地址',
-						required:true,
-						value:'leftAddress',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '离沪同行者姓名（没有填无）',
+						required: true,
+						value: 'leftDependentNames',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'离沪同行者姓名（没有填无）',
-						required:true,
-						value:'leftDependentNames',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
-					},
-					{
-						label:'离沪同行者联系方式（没有填无）',
-						required:true,
-						value:'leftDependentPhones',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
-					},
-					{
-						label:'是否返沪',
-						required:true,
-						value:'backed',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}]
-					},
-					{
-						label:'返沪出发地',
-						required:true,
-						value:'backFrom',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
-					},
-					{
-						label:'返沪出发日期',
-						required:true,
-						value:'backDate',
-						titleClass:'title',
-						type:'date',
+						label: '离沪同行者联系方式（没有填无）',
+						required: true,
+						value: 'leftDependentPhones',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'返沪方式',
-						required:true,
-						value:'backVehicle',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'火车	'},{value:'飞机',label:'否'},{value:'客车',label:'否'},{value:'自驾',label:'否'}]
+						label: '是否返沪',
+						required: true,
+						value: 'backed',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}]
 					},
 					{
-						label:'返沪车次/航班',
-						required:true,
-						value:'backVehicleNum',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '返沪出发地',
+						required: true,
+						value: 'backFrom',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'返沪到达日期',
-						required:true,
-						value:'backReachedDate',
-						titleClass:'title',
-						type:'date',
+						label: '返沪出发日期',
+						required: true,
+						value: 'backDate',
+						titleClass: 'title',
+						type: 'date',
 					},
-					{
-						label:'返沪同行者姓名（没有填无）',
-						required:true,
-						value:'backDependentNames',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+					{
+						label: '返沪方式',
+						required: true,
+						value: 'backVehicle',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '火车	'
+						}, {
+							value: '飞机',
+							label: '否'
+						}, {
+							value: '客车',
+							label: '否'
+						}, {
+							value: '自驾',
+							label: '否'
+						}]
 					},
-					{
-						label:'返沪同行者联系方式（没有填无）',
-						required:true,
-						value:'backDependentPhones',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+					{
+						label: '返沪车次/航班',
+						required: true,
+						value: 'backVehicleNum',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'当前状况',
-						required:true,
-						value:'currentStatus',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'已经确诊'},{value:'b',label:'疑似诊断'},{value:'b',label:'亲密接触者'},{value:'b',label:'正在接受集中医学观察'},{value:'b',label:'居家观察'},{value:'b',label:'已解除集中医学观察'},{value:'b',label:'无上述情况'}]
-					},
-					
-					{
-						label:'症状',
-						required:true,
-						value:'symptom',
-						titleClass:'title',
-						type:'pickerMore',
-						opts:[{value:'发热',label:'发热'},{value:'咳嗽',label:'咳嗽'},{value:'流涕',label:'流涕'},{value:'咽痛',label:'咽痛'},{value:'咳痰',label:'咳痰'},{value:'胸痛',label:'胸痛'},{value:'肌肉酸痛/关节痛',label:'肌肉酸痛/关节痛'},{value:'气促',label:'气促'},{value:'腹泻',label:'腹泻'},{value:'无上述症状',label:'无上述症状'}]
-					},
+						label: '返沪到达日期',
+						required: true,
+						value: 'backReachedDate',
+						titleClass: 'title',
+						type: 'date',
+					},
+					{
+						label: '返沪同行者姓名（没有填无）',
+						required: true,
+						value: 'backDependentNames',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
+					},
+					{
+						label: '返沪同行者联系方式（没有填无）',
+						required: true,
+						value: 'backDependentPhones',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
+					},
+					{
+						label: '当前状况',
+						required: true,
+						value: 'currentStatus',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '已经确诊'
+						}, {
+							value: 'b',
+							label: '疑似诊断'
+						}, {
+							value: 'b',
+							label: '亲密接触者'
+						}, {
+							value: 'b',
+							label: '正在接受集中医学观察'
+						}, {
+							value: 'b',
+							label: '居家观察'
+						}, {
+							value: 'b',
+							label: '已解除集中医学观察'
+						}, {
+							value: 'b',
+							label: '无上述情况'
+						}]
+					},
+
 					{
-						label:'湖北接触史',
-						required:true,
-						value:'relativesGastricCount',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'已经确诊'},{value:'b',label:'疑似诊断'},{value:'b',label:'亲密接触者'},{value:'b',label:'正在接受集中医学观察'},{value:'b',label:'居家观察'},{value:'b',label:'已解除集中医学观察'},{value:'b',label:'无上述情况'}]
+						label: '症状',
+						required: true,
+						value: 'symptom',
+						titleClass: 'title',
+						type: 'pickerMore',
+						opts: [{
+							value: '发热',
+							label: '发热'
+						}, {
+							value: '咳嗽',
+							label: '咳嗽'
+						}, {
+							value: '流涕',
+							label: '流涕'
+						}, {
+							value: '咽痛',
+							label: '咽痛'
+						}, {
+							value: '咳痰',
+							label: '咳痰'
+						}, {
+							value: '胸痛',
+							label: '胸痛'
+						}, {
+							value: '肌肉酸痛/关节痛',
+							label: '肌肉酸痛/关节痛'
+						}, {
+							value: '气促',
+							label: '气促'
+						}, {
+							value: '腹泻',
+							label: '腹泻'
+						}, {
+							value: '无上述症状',
+							label: '无上述症状'
+						}]
+					},
+					{
+						label: '湖北接触史',
+						required: true,
+						value: 'relativesGastricCount',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '已经确诊'
+						}, {
+							value: 'b',
+							label: '疑似诊断'
+						}, {
+							value: 'b',
+							label: '亲密接触者'
+						}, {
+							value: 'b',
+							label: '正在接受集中医学观察'
+						}, {
+							value: 'b',
+							label: '居家观察'
+						}, {
+							value: 'b',
+							label: '已解除集中医学观察'
+						}, {
+							value: 'b',
+							label: '无上述情况'
+						}]
 					}
 				],
-				list:[
-					{
-						label:'单位名称',
-						required:true,
-						value:'orgId',
-						titleClass:'title',
-						type:'picker',
-						opts:[]
-					},
-					{
-						label:'所在部门',
-						required:true,
-						value:'department',
-						titleClass:'title',
-						placeholder:'请输入所在部门',
-						type:'input',
-					},
-					{  
-						label:'职务',
-						required:true,
-						value:'position',
-						titleClass:'title',
-						placeholder:'请输入职务',
-						type:'input',
-					},
-					{
-						label:'员工姓名',
-						required:true, 
-						value:'name',
-						titleClass:'title',
-						placeholder:'请输入员工姓名',
-						type:'input',
-					},
-					{
-						label:'联系方式',
-						required:true,
-						value:'phone',
-						titleClass:'title',
-						placeholder:'请输入联系方式',
-						type:'input',
-					},
-					{
-						label:'国籍',  
-						required:true,
-						value:'nationality',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'中国'},{value:'b',label:'其它'}]
-					},
-					{
-						label:'身份证号/护照号',
-						required:true,
-						value:'idCard',
-						titleClass:'title',
-						placeholder:'请输入身份证号/护照号',
-						type:'input',
-					},
-					{
-						label:'户籍地址',
-						required:true,
-						value:'householdAddress',
-						titleClass:'title',
-						placeholder:'请输入户籍地址',
-						type:'input',
-					},
-					{
-						label:'在沪居住（暂住）地址',
-						required:true,
-						value:'residenceAddress', 
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
-					},
-					{
-						label:'是否复工',
-						required:true,
-						value:'returnToWork',
-						titleClass:'title',
-						type:'radio',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}],
-					},
-					{
-						label:'计划复工日期',
-						hidden:true,
-						required:true,
-						value:'planReturnDate',
-						titleClass:'title',
-						type:'date'
-					},
-					{
-						label:'是否离沪',
-						required:true,
-						value:'left',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}]
-					},
-					{
-						label:'离沪原因',
-						required:true,
-						value:'leftReason',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'探亲'},{value:'b',label:'出差'},{value:'b',label:'旅游'},{value:'b',label:'其他'}]
-					},
-					{
-						label:'离沪出发日期',
-						required:true,
-						value:'leftDate',
-						titleClass:'title',
-						type:'date',
-					},
-					{
-						label:'离沪方式',
-						required:true,
-						value:'leftVehicle',
-						titleClass:'title',
-						type:'date',
-						opts:[{value:'a',label:'火车	'},{value:'飞机',label:'否'},{value:'客车',label:'否'},{value:'自驾',label:'否'}]
+				list: [{
+						label: '单位名称',
+						required: true,
+						value: 'orgId',
+						titleClass: 'title',
+						type: 'picker',
+						opts: []
+					},
+					{
+						label: '所在部门',
+						required: true,
+						value: 'department',
+						titleClass: 'title',
+						placeholder: '请输入所在部门',
+						type: 'input',
 					},
 					{
-						label:'离沪车次/航班',
-						required:true,
-						value:'leftVehicleNum',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '职务',
+						required: true,
+						value: 'position',
+						titleClass: 'title',
+						placeholder: '请输入职务',
+						type: 'input',
 					},
 					{
-						label:'离沪到达日期',
-						required:true,
-						value:'leftReachDate',
-						titleClass:'title',
-						type:'date',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}]
+						label: '员工姓名',
+						required: true,
+						value: 'name',
+						titleClass: 'title',
+						placeholder: '请输入员工姓名',
+						type: 'input',
 					},
 					{
-						label:'离沪目的地',
-						required:true,
-						value:'leftTarget',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '联系方式',
+						required: true,
+						value: 'phone',
+						titleClass: 'title',
+						placeholder: '请输入联系方式',
+						type: 'input',
+					},
+					{	
+						label: '国籍',
+						required: true,
+						value: 'nationality',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+								label: "喀麦隆",
+								value: "Cameroon"
+							},
+							{
+								label: "加拿大",
+								value: "Canada"
+							},
+							{
+								label: "加那利群岛",
+								value: "Canary Is"
+							},
+							{
+								label: "佛得角",
+								value: "Cape Verde"
+							},
+							{
+								label: "开曼群岛",
+								value: "Cayman Is"
+							},
+							{
+								label: "中非共和国",
+								value: "Central African Rep."
+							},
+							{
+								label: "乍得",
+								value: "Chad"
+							},
+							{
+								label: "智利",
+								value: "Chile"
+							},
+							{
+								label: "中国",
+								value: "China"
+							},
+							{
+								label: "哥伦比亚",
+								value: "Colombia"
+							},
+							{
+								label: "科摩罗",
+								value: "Comoros"
+							},
+							{
+								label: "刚果",
+								value: "Congo"
+							},
+							{
+								label: "民主刚果",
+								value: "Congo,DR"
+							},
+							{
+								label: "库克群岛",
+								value: "Cook Is"
+							},
+							{
+								label: "哥斯达黎加",
+								value: "Costa Rica"
+							},
+							{
+								label: "科特迪瓦",
+								value: "Cote d'lvoire"
+							},
+							{
+								label: "克罗地亚",
+								value: "Croatia Rep"
+							},
+							{
+								label: "古巴",
+								value: "Cuba"
+							},
+							{
+								label: "库腊索岛",
+								value: "Curacao"
+							},
+							{
+								label: "塞浦路斯",
+								value: "Cyprus"
+							},
+							{
+								label: "捷克共和国",
+								value: "Czech Rep"
+							},
+							{
+								label: "丹麦",
+								value: "Denmark"
+							},
+							{
+								label: "吉布提",
+								value: "Djibouti"
+							},
+							{
+								label: "多米尼克",
+								value: "Dominica"
+							},
+							{
+								label: "多米尼加共和国",
+								value: "Dominican Rep."
+							},
+							{
+								label: "东帝汶",
+								value: "East Timor"
+							},
+							{
+								label: "厄瓜多尔",
+								value: "Ecuador"
+							},
+							{
+								label: "埃及",
+								value: "Egypt"
+							},
+							{
+								label: "萨尔瓦多",
+								value: "El Salvador"
+							},
+							{
+								label: "赤道几内亚",
+								value: "Eq.Guinea"
+							},
+							{
+								label: "厄立特里亚",
+								value: "Eritrea"
+							},
+							{
+								label: "爱沙尼亚",
+								value: "Estonia"
+							},
+							{
+								label: "埃塞俄比亚",
+								value: "Ethiopia"
+							},
+							{
+								label: "斐济",
+								value: "Fiji"
+							},
+							{
+								label: "芬兰",
+								value: "Finland"
+							},
+							{
+								label: "法国",
+								value: "France"
+							},
+							{
+								label: "法属圭亚那",
+								value: "French Guyana"
+							},
+							{
+								label: "法属玻利尼西亚",
+								value: "French Polynesia"
+							},
+							{
+								label: "加蓬",
+								value: "Gabon"
+							},
+							{
+								label: "冈比亚",
+								value: "Gambia"
+							},
+							{
+								label: "盖比群岛",
+								value: "Gambier Is"
+							},
+							{
+								label: "格鲁吉亚",
+								value: "Georgia"
+							},
+							{
+								label: "德国",
+								value: "Germany"
+							},
+							{
+								label: "加纳",
+								value: "Ghana"
+							},
+							{
+								label: "直布罗陀",
+								value: "Gibraltar"
+							},
+							{
+								label: "希腊",
+								value: "Greece"
+							},
+							{
+								label: "格陵兰",
+								value: "Greenland"
+							},
+							{
+								label: "格林纳达",
+								value: "Grenada"
+							},
+							{
+								label: "瓜德罗普",
+								value: "Guadeloupe"
+							},
+							{
+								label: "危地马拉",
+								value: "Guatemala"
+							},
+							{
+								label: "几内亚",
+								value: "Guinea"
+							},
+							{
+								label: "几内亚(比绍)",
+								value: "Guinea Bissau"
+							},
+							{
+								label: "圭亚那",
+								value: "Guyana"
+							},
+							{
+								label: "海地",
+								value: "Haiti"
+							},
+							{
+								label: "洪都拉斯",
+								value: "Honduras"
+							},
+							{
+								label: "中国香港",
+								value: "Hong Kong"
+							},
+							{
+								label: "匈牙利",
+								value: "Hungary"
+							},
+							{
+								label: "冰岛",
+								value: "Iceland"
+							},
+							{
+								label: "印度",
+								value: "India"
+							},
+							{
+								label: "印度尼西亚",
+								value: "Indonesia"
+							},
+							{
+								label: "伊朗",
+								value: "Iran"
+							},
+							{
+								label: "伊拉克",
+								value: "Iraq"
+							},
+							{
+								label: "爱尔兰",
+								value: "Ireland"
+							},
+							{
+								label: "以色列",
+								value: "Israel"
+							},
+							{
+								label: "意大利",
+								value: "Italy"
+							},
+							{
+								label: "牙买加",
+								value: "Jamaica"
+							},
+							{
+								label: "日本",
+								value: "Japan"
+							},
+							{
+								label: "约旦",
+								value: "Jordan"
+							},
+							{
+								label: "哈萨克斯坦",
+								value: "Kazakhstan"
+							},
+							{
+								label: "肯尼亚",
+								value: "Kenya"
+							},
+							{
+								label: "吉尔吉斯斯坦",
+								value: "Kirghizia"
+							},
+							{
+								label: "基里巴斯",
+								value: "Kiribati"
+							},
+							{
+								label: "韩国",
+								value: "Korea Rep."
+							},
+							{
+								label: "朝鲜",
+								value: "Korea,DPR"
+							},
+							{
+								label: "科威特",
+								value: "Kuwait"
+							},
+							{
+								label: "老挝",
+								value: "Laos,PDR"
+							},
+							{
+								label: "拉脱维亚",
+								value: "Latvia"
+							},
+							{
+								label: "黎巴嫩",
+								value: "Lebanon"
+							},
+							{
+								label: "莱索托",
+								value: "Lesotho"
+							},
+							{
+								label: "利比里亚",
+								value: "Liberia"
+							},
+							{
+								label: "利比亚",
+								value: "Libyan Arab Jm"
+							},
+							{
+								label: "列支敦士登",
+								value: "Liechtenstein"
+							},
+							{
+								label: "立陶宛",
+								value: "Lithuania"
+							},
+							{
+								label: "卢森堡",
+								value: "Luxembourg"
+							},
+							{
+								label: "中国澳门",
+								value: "Macau"
+							},
+							{
+								label: "马其顿",
+								value: "Macedonia Rep"
+							},
+							{
+								label: "马达加斯加",
+								value: "Madagascar"
+							},
+							{
+								label: "马拉维",
+								value: "Malawi"
+							},
+							{
+								label: "马来西亚",
+								value: "Malaysia"
+							},
+							{
+								label: "马尔代夫",
+								value: "Maldives"
+							},
+							{
+								label: "马里",
+								value: "Mali"
+							},
+							{
+								label: "马耳他",
+								value: "Malta"
+							},
+							{
+								label: "马克萨斯群岛",
+								value: "Marquesas Is"
+							},
+							{
+								label: "马绍尔群岛",
+								value: "Marshall Is Rep"
+							},
+							{
+								label: "马提尼克",
+								value: "Martinique"
+							},
+							{
+								label: "毛里塔尼亚",
+								value: "Mauritania"
+							},
+							{
+								label: "毛里求斯",
+								value: "Mauritius"
+							},
+							{
+								label: "马约特岛",
+								value: "Mayotte"
+							},
+							{
+								label: "梅利利亚",
+								value: "Melilla"
+							},
+							{
+								label: "墨西哥",
+								value: "Mexico"
+							},
+							{
+								label: "密克罗尼西亚联邦",
+								value: "Micronesia Fs"
+							},
+							{
+								label: "摩尔多瓦",
+								value: "Moldavia"
+							},
+							{
+								label: "摩纳哥",
+								value: "Monaco"
+							},
+							{
+								label: "蒙古",
+								value: "Mongolia"
+							},
+							{
+								label: "蒙特塞拉特",
+								value: "Montserrat"
+							},
+							{
+								label: "摩洛哥",
+								value: "Morocco"
+							},
+							{
+								label: "莫桑比克",
+								value: "Mozambique"
+							},
+							{
+								label: "缅甸",
+								value: "Myanmar"
+							},
+							{
+								label: "纳米比亚",
+								value: "Namibia"
+							},
+							{
+								label: "瑙鲁",
+								value: "Nauru"
+							},
+							{
+								label: "尼泊尔",
+								value: "Nepal"
+							},
+							{
+								label: "荷兰",
+								value: "Netherlands"
+							},
+							{
+								label: "荷属安德列斯",
+								value: "NETHERLANDS ANTILLES"
+							},
+							{
+								label: "新喀里多尼亚",
+								value: "New Caledonia"
+							},
+							{
+								label: "新西兰",
+								value: "New Zealand"
+							},
+							{
+								label: "尼加拉瓜",
+								value: "Nicaragua"
+							},
+							{
+								label: "尼日尔",
+								value: "Niger"
+							},
+							{
+								label: "尼日利亚",
+								value: "Nigeria"
+							},
+							{
+								label: "诺福克岛",
+								value: "Norfolk Is"
+							},
+							{
+								label: "挪威",
+								value: "Norway"
+							},
+							{
+								label: "阿曼",
+								value: "Oman"
+							},
+							{
+								label: "巴基斯坦",
+								value: "Pakistan"
+							},
+							{
+								label: "帕劳共和国",
+								value: "Palau"
+							},
+							{
+								label: "巴勒斯坦",
+								value: "Palestine"
+							},
+							{
+								label: "巴拿马",
+								value: "Panama"
+							},
+							{
+								label: "巴布亚新几内亚",
+								value: "Papua New Guinea"
+							},
+							{
+								label: "巴拉圭",
+								value: "Paraguay"
+							},
+							{
+								label: "秘鲁",
+								value: "Peru"
+							},
+							{
+								label: "菲律宾",
+								value: "Philippines"
+							},
+							{
+								label: "波兰",
+								value: "Poland"
+							},
+							{
+								label: "葡萄牙",
+								value: "Portugal"
+							},
+							{
+								label: "波多黎各",
+								value: "Puerto Rico"
+							},
+							{
+								label: "卡塔尔",
+								value: "Qatar"
+							},
+							{
+								label: "也门共和国",
+								value: "Republic of Yemen"
+							},
+							{
+								label: "留尼汪",
+								value: "Reunion"
+							},
+							{
+								label: "罗马尼亚",
+								value: "Romania"
+							},
+							{
+								label: "俄罗斯联邦",
+								value: "Russia"
+							},
+							{
+								label: "卢旺达",
+								value: "Rwanda"
+							},
+							{
+								label: "南非",
+								value: "S.Africa"
+							},
+							{
+								label: "萨巴",
+								value: "Saba"
+							},
+							{
+								label: "圣卢西亚",
+								value: "Saint Lucia"
+							},
+							{
+								label: "圣马丁岛",
+								value: "Saint Martin Is"
+							},
+							{
+								label: "圣文森特和格林纳丁斯",
+								value: "Saint Vincent & Grenadines"
+							},
+							{
+								label: "萨摩亚",
+								value: "Samoa"
+							},
+							{
+								label: "圣马力诺",
+								value: "San Marino"
+							},
+							{
+								label: "圣多美和普林西比",
+								value: "Sao Tome and Principe"
+							},
+							{
+								label: "沙特阿拉伯",
+								value: "Saudi Arabia"
+							},
+							{
+								label: "塞内加尔",
+								value: "Senegal"
+							},
+							{
+								label: "塞黑",
+								value: "Serbia & Montenegro"
+							},
+							{
+								label: "塞舌尔",
+								value: "Seychelles"
+							},
+							{
+								label: "塞拉利昂",
+								value: "Sierra Leone"
+							},
+							{
+								label: "新加坡",
+								value: "Singapore"
+							},
+							{
+								label: "斯洛伐克",
+								value: "Slovak Rep"
+							},
+							{
+								label: "斯洛文尼亚",
+								value: "Slovenia Rep"
+							},
+							{
+								label: "社会群岛",
+								value: "Society Is"
+							},
+							{
+								label: "所罗门群岛",
+								value: "Solomon Is"
+							},
+							{
+								label: "索马里",
+								value: "Somalia"
+							},
+							{
+								label: "西班牙",
+								value: "Spain"
+							},
+							{
+								label: "斯里兰卡",
+								value: "Sri Lanka"
+							},
+							{
+								label: "圣其茨-尼维斯",
+								value: "St. Kitts-Nevis"
+							},
+							{
+								label: "圣卢西亚",
+								value: "ST. LUCIA"
+							},
+							{
+								label: "圣文森特和格纳丁斯",
+								value: "ST. VINCENT AND THE GRENADINES"
+							},
+							{
+								label: "圣皮埃尔和密克隆",
+								value: "St.Pierre and Miquelon"
+							},
+							{
+								label: "苏丹",
+								value: "Sudan"
+							},
+							{
+								label: "苏里南",
+								value: "Suriname"
+							},
+							{
+								label: "斯威士兰",
+								value: "Swaziland"
+							},
+							{
+								label: "瑞典",
+								value: "Sweden"
+							},
+							{
+								label: "瑞士",
+								value: "Switzerland"
+							},
+							{
+								label: "叙利亚",
+								value: "Syrian"
+							},
+							{
+								label: "塔吉克斯坦",
+								value: "Tadzhikistan"
+							},
+							{
+								label: "中国台湾",
+								value: "Taiwan prov."
+							},
+							{
+								label: "坦桑尼亚",
+								value: "Tanzania"
+							},
+							{
+								label: "泰国",
+								value: "Thailand"
+							},
+							{
+								label: "荷属安地列斯群岛",
+								value: "the Netherlands Antilles"
+							},
+							{
+								label: "多哥",
+								value: "Togo"
+							},
+							{
+								label: "汤加",
+								value: "Tonga"
+							},
+							{
+								label: "特立尼达和多巴哥",
+								value: "Trinidad & Tobago"
+							},
+							{
+								label: "土阿莫土群岛",
+								value: "Tuamotu Is"
+							},
+							{
+								label: "土布艾群岛",
+								value: "Tubai Is"
+							},
+							{
+								label: "突尼斯",
+								value: "Tunisia"
+							},
+							{
+								label: "土耳其",
+								value: "Turkey"
+							},
+							{
+								label: "土库曼斯坦",
+								value: "Turkmenistan"
+							},
+							{
+								label: "特克斯和凯科斯群岛",
+								value: "Turks & Caicos Is"
+							},
+							{
+								label: "图瓦卢",
+								value: "Tuvalu"
+							},
+							{
+								label: "乌干达",
+								value: "Uganda"
+							},
+							{
+								label: "乌克兰",
+								value: "Ukraine"
+							},
+							{
+								label: "阿联酋",
+								value: "United Arab Emirates"
+							},
+							{
+								label: "英国",
+								value: "United Kingdom"
+							},
+							{
+								label: "美国",
+								value: "United States"
+							},
+							{
+								label: "乌拉圭",
+								value: "Uruguay"
+							},
+							{
+								label: "乌兹别克斯坦",
+								value: "Uzbekstan"
+							},
+							{
+								label: "瓦努阿图",
+								value: "Vanuatu"
+							},
+							{
+								label: "梵蒂冈城国",
+								value: "Vatican City State"
+							},
+							{
+								label: "委内瑞拉",
+								value: "Venezuela"
+							},
+							{
+								label: "越南",
+								value: "Vietnam"
+							},
+							{
+								label: "英属维尔京群岛",
+								value: "VIRGIN IS.(U.K.)"
+							},
+							{
+								label: "美属维尔京群岛",
+								value: "VIRGIN IS.(US)"
+							},
+							{
+								label: "瓦利斯和浮图纳",
+								value: "Wallis and Futuna"
+							},
+							{
+								label: "西撒哈拉",
+								value: "Western Sahara"
+							},
+							{
+								label: "赞比亚",
+								value: "Zambia"
+							},
+							{
+								label: "津巴布韦",
+								value: "Zimbabwe"
+							}
+						]
+					},
+					{
+						label: '身份证号/护照号',
+						required: true,
+						value: 'idCard',
+						titleClass: 'title',
+						placeholder: '请输入身份证号/护照号',
+						type: 'input',
 					},
 					{
-						label:'离沪具体地址',
-						required:true,
-						value:'leftAddress',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '户籍地址',
+						required: true,
+						value: 'householdAddress',
+						titleClass: 'title',
+						placeholder: '请输入户籍地址',
+						type: 'input',
 					},
 					{
-						label:'离沪同行者姓名（没有填无）',
-						required:true,
-						value:'leftDependentNames',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '在沪居住（暂住）地址',
+						required: true,
+						value: 'residenceAddress',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'离沪同行者联系方式（没有填无）',
-						required:true,
-						value:'leftDependentPhones',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '是否复工',
+						required: true,
+						value: 'returnToWork',
+						titleClass: 'title',
+						type: 'radio',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}],
 					},
 					{
-						label:'是否返沪',
-						required:true,
-						value:'backed',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'是'},{value:'b',label:'否'}]
+						label: '计划复工日期',
+						hidden: true,
+						required: true,
+						value: 'planReturnDate',
+						titleClass: 'title',
+						type: 'date'
 					},
 					{
-						label:'返沪出发地',
-						required:true,
-						value:'backFrom',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '是否离沪',
+						required: true,
+						value: 'left',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}]
 					},
 					{
-						label:'返沪出发日期',
-						required:true,
-						value:'backDate',
-						titleClass:'title',
-						type:'date',
+						label: '离沪原因',
+						required: true,
+						value: 'leftReason',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '探亲'
+						}, {
+							value: 'b',
+							label: '出差'
+						}, {
+							value: 'b',
+							label: '旅游'
+						}, {
+							value: 'b',
+							label: '其他'
+						}]
 					},
 					{
-						label:'返沪方式',
-						required:true,
-						value:'backVehicle',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'火车	'},{value:'飞机',label:'否'},{value:'客车',label:'否'},{value:'自驾',label:'否'}]
+						label: '离沪出发日期',
+						required: true,
+						value: 'leftDate',
+						titleClass: 'title',
+						type: 'date',
 					},
 					{
-						label:'返沪车次/航班',
-						required:true,
-						value:'backVehicleNum',
-						titleClass:'title',
-						placeholder:'请输入地址',
-						type:'input',
+						label: '离沪方式',
+						required: true,
+						value: 'leftVehicle',
+						titleClass: 'title',
+						type: 'date',
+						opts: [{
+							value: 'a',
+							label: '火车	'
+						}, {
+							value: '飞机',
+							label: '否'
+						}, {
+							value: '客车',
+							label: '否'
+						}, {
+							value: '自驾',
+							label: '否'
+						}]
 					},
 					{
-						label:'返沪到达日期',
-						required:true,
-						value:'backReachedDate',
-						titleClass:'title',
-						type:'date',
+						label: '离沪车次/航班',
+						required: true,
+						value: 'leftVehicleNum',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'返沪同行者姓名（没有填无）',
-						required:true,
-						value:'backDependentNames',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '离沪到达日期',
+						required: true,
+						value: 'leftReachDate',
+						titleClass: 'title',
+						type: 'date',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}]
 					},
 					{
-						label:'返沪同行者联系方式（没有填无）',
-						required:true,
-						value:'backDependentPhones',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '离沪目的地',
+						required: true,
+						value: 'leftTarget',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'当前状况',
-						required:true,
-						value:'currentStatus',
-						titleClass:'title',
-						type:'picker',
-						opts:[{value:'a',label:'已经确诊'},{value:'b',label:'疑似诊断'},{value:'b',label:'亲密接触者'},{value:'b',label:'正在接受集中医学观察'},{value:'b',label:'居家观察'},{value:'b',label:'已解除集中医学观察'},{value:'b',label:'无上述情况'}]
+						label: '离沪具体地址',
+						required: true,
+						value: 'leftAddress',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
 					},
 					{
-						label:'症状',
-						required:true,
-						value:'symptom',
-						titleClass:'title',
-						type:'pickerMore',
-						opts:[{value:'发热',label:'发热'},{value:'咳嗽',label:'咳嗽'},{value:'流涕',label:'流涕'},{value:'咽痛',label:'咽痛'},{value:'咳痰',label:'咳痰'},{value:'胸痛',label:'胸痛'},{value:'肌肉酸痛/关节痛',label:'肌肉酸痛/关节痛'},{value:'气促',label:'气促'},{value:'腹泻',label:'腹泻'},{value:'以上均无',label:'以上均无'}]
+						label: '离沪同行者姓名（没有填无）',
+						required: true,
+						value: 'leftDependentNames',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'湖北接触史',
-						required:true,
-						value:'relativesGastricCount',
-						titleClass:'title',
-						type:'radio',
-						opts:[{value:'已经确诊',label:'已经确诊'},{value:'疑似诊断',label:'疑似诊断'},{value:'亲密接触者',label:'亲密接触者'},{value:'正在接受集中医学观察',label:'正在接受集中医学观察'},{value:'居家观察',label:'居家观察'},{value:'已解除集中医学观察',label:'已解除集中医学观察'}]
+						label: '离沪同行者联系方式（没有填无）',
+						required: true,
+						value: 'leftDependentPhones',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'患者接触史',
-						required:true,
-						value:'relativesGastricCount',
-						titleClass:'title',
-						type:'radio',
-						opts:[{value:'接触过已确诊或疑似患者',label:'接触过已确诊或疑似患者'},{value:'家属接触过已确诊或疑似患者',label:'家属接触过已确诊或疑似患者'}]
+						label: '是否返沪',
+						required: true,
+						value: 'backed',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '是'
+						}, {
+							value: 'b',
+							label: '否'
+						}]
 					},
 					{
-						label:'隔离地址',
-						required:true,
-						value:'quarantineAdress',
-						titleClass:'title',
-						placeholder:'请输入',
-						type:'input',
+						label: '返沪出发地',
+						required: true,
+						value: 'backFrom',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
 					},
 					{
-						label:'隔离开始日期',
-						required:true,
-						value:'quarantineDate',
-						titleClass:'title',
-						type:'date',
+						label: '返沪出发日期',
+						required: true,
+						value: 'backDate',
+						titleClass: 'title',
+						type: 'date',
+					},
+					{
+						label: '返沪方式',
+						required: true,
+						value: 'backVehicle',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '火车	'
+						}, {
+							value: '飞机',
+							label: '否'
+						}, {
+							value: '客车',
+							label: '否'
+						}, {
+							value: '自驾',
+							label: '否'
+						}]
+					},
+					{
+						label: '返沪车次/航班',
+						required: true,
+						value: 'backVehicleNum',
+						titleClass: 'title',
+						placeholder: '请输入地址',
+						type: 'input',
+					},
+					{
+						label: '返沪到达日期',
+						required: true,
+						value: 'backReachedDate',
+						titleClass: 'title',
+						type: 'date',
+					},
+					{
+						label: '返沪同行者姓名（没有填无）',
+						required: true,
+						value: 'backDependentNames',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
+					},
+					{
+						label: '返沪同行者联系方式（没有填无）',
+						required: true,
+						value: 'backDependentPhones',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
+					},
+					{
+						label: '当前状况',
+						required: true,
+						value: 'currentStatus',
+						titleClass: 'title',
+						type: 'picker',
+						opts: [{
+							value: 'a',
+							label: '已经确诊'
+						}, {
+							value: 'b',
+							label: '疑似诊断'
+						}, {
+							value: 'b',
+							label: '亲密接触者'
+						}, {
+							value: 'b',
+							label: '正在接受集中医学观察'
+						}, {
+							value: 'b',
+							label: '居家观察'
+						}, {
+							value: 'b',
+							label: '已解除集中医学观察'
+						}, {
+							value: 'b',
+							label: '无上述情况'
+						}]
+					},
+					{
+						label: '症状',
+						required: true,
+						value: 'symptom',
+						titleClass: 'title',
+						type: 'pickerMore',
+						opts: [{
+							value: '发热',
+							label: '发热'
+						}, {
+							value: '咳嗽',
+							label: '咳嗽'
+						}, {
+							value: '流涕',
+							label: '流涕'
+						}, {
+							value: '咽痛',
+							label: '咽痛'
+						}, {
+							value: '咳痰',
+							label: '咳痰'
+						}, {
+							value: '胸痛',
+							label: '胸痛'
+						}, {
+							value: '肌肉酸痛/关节痛',
+							label: '肌肉酸痛/关节痛'
+						}, {
+							value: '气促',
+							label: '气促'
+						}, {
+							value: '腹泻',
+							label: '腹泻'
+						}, {
+							value: '以上均无',
+							label: '以上均无'
+						}]
+					},
+					{
+						label: '湖北接触史',
+						required: true,
+						value: 'relativesGastricCount',
+						titleClass: 'title',
+						type: 'radio',
+						opts: [{
+							value: '已经确诊',
+							label: '已经确诊'
+						}, {
+							value: '疑似诊断',
+							label: '疑似诊断'
+						}, {
+							value: '亲密接触者',
+							label: '亲密接触者'
+						}, {
+							value: '正在接受集中医学观察',
+							label: '正在接受集中医学观察'
+						}, {
+							value: '居家观察',
+							label: '居家观察'
+						}, {
+							value: '已解除集中医学观察',
+							label: '已解除集中医学观察'
+						}]
+					},
+					{
+						label: '患者接触史',
+						required: true,
+						value: 'relativesGastricCount',
+						titleClass: 'title',
+						type: 'radio',
+						opts: [{
+							value: '接触过已确诊或疑似患者',
+							label: '接触过已确诊或疑似患者'
+						}, {
+							value: '家属接触过已确诊或疑似患者',
+							label: '家属接触过已确诊或疑似患者'
+						}]
+					},
+					{
+						label: '隔离地址',
+						required: true,
+						value: 'quarantineAdress',
+						titleClass: 'title',
+						placeholder: '请输入',
+						type: 'input',
+					},
+					{
+						label: '隔离开始日期',
+						required: true,
+						value: 'quarantineDate',
+						titleClass: 'title',
+						type: 'date',
 					},
 				],
-				form:{
-					agree:'',
-					orgId:-1,
-					department:'',
-					position:'',
-					name:'',
-					phone:'',
-					nationality:-1,
-					idCard:'',
-					returnToWork:-1,
-					householdAddress:'',
-					residenceAddress:'',
-					planReturnDate:''
+				form: {
+					agree: '',
+					orgId: -1,
+					department: '',
+					position: '',
+					name: '',
+					phone: '',
+					nationality: -1,
+					idCard: '',
+					returnToWork: -1,
+					householdAddress: '',
+					residenceAddress: '',
+					planReturnDate: ''
 				}
 			}
 		},
-		
+
 		onLoad(option) {
 			this.getOrg()
 		},
-		
-		
+
+
 		methods: {
-			getOrg(){
+			getOrg() {
 				const data = {
 					params: {
 						pageNum: 1,
@@ -636,11 +1699,11 @@
 					const d = res.data
 					if (d.code == 1) {
 						let list = []
-						d.object.list.forEach(item=>{
+						d.object.list.forEach(item => {
 							list.push({
-								label:item.orgName,
-								value:item.id
-							}) 
+								label: item.orgName,
+								value: item.id
+							})
 						})
 						this.list[0].opts = list
 					}
@@ -649,8 +1712,8 @@
 				})
 			},
 			// 获取信息
-			getInfo(id){
-				
+			getInfo(id) {
+
 			},
 			// 更新复选框绑定的表单内容
 			checkboxChange(index, checkList, obj, prop) {
@@ -669,17 +1732,17 @@
 					this.$set(checkList[checkList.length - 1], 'checked', false)
 				}
 			},
-			radioChange(val,prop){
-				this.$set(this.form,prop,val)
+			radioChange(val, prop) {
+				this.$set(this.form, prop, val)
 				this.isShowChild()
 			},
-			
-			isShowChild(){
+
+			isShowChild() {
 				console.log(this.form['returnToWork'])
 				this.list[10].hidden = this.form['returnToWork'] == 'a'
 			},
-			
-			Switch(e,prop){
+
+			Switch(e, prop) {
 				this.form[prop] = e.detail.value
 			},
 			// 更新输入框绑定的表单内容
@@ -687,11 +1750,11 @@
 				this.form[props] = event.target.value
 			},
 			// 更新下拉框绑定的表单内容
-			updatePickerVal(event,props){
+			updatePickerVal(event, props) {
 				this.$set(this.form, props, event.detail.value)
 			},
 			// 提交信息
-			formSubmit(){
+			formSubmit() {
 				console.log(this.form)
 				// let flag = true
 				// let msg = ''
@@ -710,14 +1773,14 @@
 				// 		}
 				// 	}
 				// }
-				
+
 				// if(!flag){
 				// 	return false
 				// }else{
 				// 	this.$http.post(`/ewell-gastric-cancer-data/wechat/report`,obj).then(res => {
 				// 		const d = res.data
 				// 		if(d.code == 1){
-							
+
 				// 		}else{
 				// 			uni.showToast({
 				// 				icon: 'none',
@@ -749,16 +1812,19 @@
 
 	.sict-value {
 		margin-top: 15upx;
+
 		.right {
 			margin-left: 10upx;
 			vertical-align: bottom;
 		}
+
 		.label {
 			// display: inline-block;
 			text-align: left;
 			padding: 20upx 0;
 			padding-left: 30upx;
 			border-bottom: 2upx solid #d3d3d3;
+
 			&:last-child {
 				border-bottom: 0;
 			}
diff --git a/pages/security/security.vue b/pages/security/security.vue
index 11af27d6a7129aaf9743f8fe81c6f527429fcb8a..2e702a78b596c16fa40fbcd3c78b4bb26e83e37c 100644
--- a/pages/security/security.vue
+++ b/pages/security/security.vue
@@ -8,7 +8,7 @@
 			<view v-show="abnormalFlag">
 				<view class="cu-form-group">
 					<view class="title">体温值：</view>
-					<input class="text-left" placeholder="请输入体温" type="number" :value="temperature" name="input" @input="updateInputVal($event,'temperature')"></input>
+					<input class="text-left" type="number" :value="form['heat']" name="input" @input="updateInputVal($event,'heat')"></input>
 				</view>
 				<view class="btnList" style="padding-top: 55upx;">
 					<button class="btnSubmit" type="primary" @click="submit">提交</button>
@@ -24,6 +24,11 @@
 		name: "home",
 		data() {
 			return {
+				form:{
+					heat:'',
+					heatNomal:-1,
+					userId:''
+				},
 				temperature:'',
 				abnormalFlag:false
 			};
@@ -35,10 +40,18 @@
 		methods: {
 			// 体温正常
 			normal() {
-				uni.showToast({
-					icon: 'success',
-					title: "允许通行！"
+				this.form.heatNomal = 0
+				this.form.userId = this.$store.state.user.userInfo.id
+				this.form.heat = ''
+				this.$http.post(`/sict-ncov/report/daily/heat`,this.form).then(res => {
+					const d = res.data
+					if (d.code == 1) {
+						console.log(d)
+					}
+				}).catch(err => {
+					console.log(err)
 				})
+				
 			},
 			// 体温异常
 			abnormal() {
@@ -46,13 +59,24 @@
 			},
 			// 更新输入框绑定的表单内容
 			updateInputVal(event, props) {
-				this.temperature = event.target.value
+				this.form[props] = event.target.value
 			},
 			// 提交异常体温
 			submit(){
-				uni.showToast({
-					icon: 'none',
-					title: "提交异常体温！"
+				this.form.heatNomal = this.form.heat<37.2?0:1
+				this.form.userId = this.$store.state.user.userInfo.id
+				console.log(this.form)
+				// uni.showToast({
+				// 	icon: 'none',
+				// 	title: "提交异常体温！"
+				// })
+				this.$http.post(`/sict-ncov/report/daily/heat`,this.form).then(res => {
+					const d = res.data
+					if (d.code == 1) {
+						console.log(d)
+					}
+				}).catch(err => {
+					console.log(err)
 				})
 			}
 		}
@@ -67,7 +91,7 @@
 		width: 100vw;
 		background-color: #24A1E3;
 		.btnList{
-			padding-top: 305upx;
+			padding-top: 235upx;
 			.btnNormal,.btnAbnormal,.btnSubmit{
 				background-color: #92d0f1;
 				color: #FFFFFF;