diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 8d1b761e..4300a7d3 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -67,9 +67,9 @@
                     placeholder="请输入姓名"
                     clearable
                     :disabled="isFromResi"
-                    v-model="formData.name">
+                    v-model="formData.name" style="margin-right:10px;">
           </el-input>
-
+          <el-checkbox v-model="heSuanCheck">添加到核酸检测关注名单</el-checkbox>
         </el-form-item>
 
         <el-form-item label="手机号"
@@ -94,13 +94,61 @@
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
+        <el-form-item 
+                      label="现居地"
+                      prop="presentAddress"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.presentAddress"
+                     placeholder="请选择"
+                     :disabled="isFromResi"
+                     filterable
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="详细地址"
+                      prop="detailAddress"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入详细地址"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.detailAddress">
+          </el-input>
+        </el-form-item>
+        <el-form-item 
+                      label="来自地区"
+                      prop="sourceAddress"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.sourceAddress"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-        <el-form-item label="检测时间"
+        <el-form-item label="来到本地时间"
                       style="display: block"
-                      prop="natTime"
+                      prop="arriveDate"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.natTime"
+                          v-model="formData.arriveDate"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -108,54 +156,31 @@
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="检测地点"
-                      prop="natAddress"
+        <el-form-item label="离开本地时间"
+                      style="display: block"
+                      prop="leaveDate"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.leaveDate"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
-                    v-model="formData.natAddress">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="检测结果"
-                      prop="type"
-                      label-width="150px"
-                      style="display: block">
-          <el-radio-group v-model="formData.natResult">
-
-            <el-radio :label="'0'">阴性</el-radio>
-            <el-radio :label="'1'">阳性</el-radio>
-
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item class="block"
-                      label-width="150px"
-                      style="display: block"
-                      label="添加图片"
-                      prop="attach">
-
-          <el-upload :action="uploadUlr"
-                     list-type="picture-card"
-                     :limit="limitNum"
-                     :class="{hide:hideUploadEdit}"
-                     accept=".jpg,.png,.gif"
-                     :on-preview="handlePictureCardPreview"
-                     :on-success="handleFileSuccess"
-                     :on-remove="handleRemove"
-                     :before-upload="beforeUpload"
-                     :on-change="handleEditChange"
-                     :file-list="fileList">
-            <i v-if="formType!=='detail'"
-               class="el-icon-plus"></i>
-            <div v-if="formType!=='detail'"
-                 slot="tip"
-                 class="el-upload__tip">请选择1张图片，只能上传jpg、png、gif格式</div>
-          </el-upload>
-
+                    placeholder="请输入内容"
+                    v-model="formData.remark"></el-input>
         </el-form-item>
 
         <el-form-item label="通知渠道"
@@ -234,22 +259,49 @@ export default {
 
       icNatId: '',
       formData: {
-        icNatId: '',
+        gridId: '',
         agencyId: '',//当前网格所属组织Id	
         userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
         userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
         name: '',
         idCard: '',
         mobile: '',
-        natTime: '',
-        natAddress: '',
-        natResult: '',
-        channel: [],
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        detailAddress: '',
+        sourceAddressCode: '',
+        sourceAddress: '',
+        arriveDate: '',
+        remark: '',
+        leaveDate: '',
+        userType: '',
         content: '',
+        channel: []
 
-        fileName: '',//附件名	
-        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
-        attachmentUrl: '',//附件地址	
+      },
+      dataRule: {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        presentAddress: [
+          { required: true, message: '现居地不能为空', trigger: 'blur' },
+        ],
+        detailAddress: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' },
+        ],
+        sourceAddress: [
+          { required: true, message: '来自地区不能为空', trigger: 'blur' },
+        ],
+        arriveDate: [
+          { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+        ]
       },
 
       fileList: [],
@@ -542,51 +594,6 @@ export default {
         loading.close()
       }
     }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: '身份证号不能为空', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
-        ],
-        natTime: [
-          { required: true, message: '检测时间不能为空', trigger: 'blur' },
-        ],
-
-        natAddress: [
-          { required: false },
-        ],
-        natResult: [
-          { required: true },
-        ],
-        natAddress: [
-          { required: false },
-        ],
-        channel: [
-          { required: false },
-        ],
-        content: [
-          { required: false },
-        ],
-
-      }
-    },
-
-  },
-  props: {
-
-
-
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
   }
 }
 </script>