From bc4ec5ef7a74c273625ac2041b630256915957ba Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 30 Mar 2022 13:51:23 +0800
Subject: [PATCH] dd

---
 src/views/modules/base/epidemic/travel.vue | 119 ++++++++++++++-------
 1 file changed, 83 insertions(+), 36 deletions(-)

diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index 9091d65d..be486046 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -4,12 +4,12 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'90px'">
+               :label-width="'100px'">
         <div>
           
           <el-form-item label="姓名"
-                        prop="personInCharge">
-            <el-input v-model="formData.personInCharge"
+                        prop="name">
+            <el-input v-model="formData.name"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -17,10 +17,20 @@
             </el-input>
 
           </el-form-item>
-
-          <el-form-item label="身份证"
+          <el-form-item label="手机号"
                         prop="mobile">
             <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="idCard">
+            <el-input v-model="formData.idCard"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -29,8 +39,22 @@
 
           </el-form-item>
 
-          <el-form-item label="接种时间"
-                        prop="scheduledStartTime">
+        </div>
+        <div>
+          
+          <el-form-item label="来自地区"
+                        prop="sourceAddressCode">
+            <el-input v-model="formData.sourceAddressCode"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="来到本地时间"
+                        prop="startDate">
             <el-date-picker v-model="timeRange"
                             size="small"
                             type="daterange"
@@ -107,33 +131,58 @@
                          header-align="center"
                          align="center"
                          label="手机号"
-                         width="110">
+                         width="120">
         </el-table-column>
         <el-table-column prop="gridNames"
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="现居地"
+                         show-overflow-tooltip
+                         min-width="160">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="来自地区"
+                         show-overflow-tooltip
+                         min-width="160">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="来到本地时间"
+                         width="160">
         </el-table-column>
         <el-table-column prop="time"
                          header-align="center"
                          align="center"
-                         label="检测时间"
-                         width="120">
+                         label="离开本地时间"
+                         width="160">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
-                         show-overflow-tooltip
-                         label="检测机构"
-                         min-width="230">
+                         label="最近一次通知时间"
+                         width="160">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测结果"
-                         min-width="80">
+                         label="备注"
+                         min-width="120">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="核酸检测关注名单"
+                         width="160">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -182,9 +231,9 @@
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <nat-form ref="ref_form"
+      <travel-form ref="ref_form"
                 @dialogCancle="addFormCancle"
-                @dialogOk="addFormOk"></nat-form>
+                @dialogOk="addFormOk"></travel-form>
     </el-dialog>
 
   </div>
@@ -192,7 +241,7 @@
 
 <script>
 
-import natForm from './natInfo/natForm'
+import travelForm from './travelForm'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -212,11 +261,12 @@ export default {
 
       timeRange: [],
       formData: {
-        personInCharge: '',//负责人		
+        name: '',//负责人		
         mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        idCard: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: ''
       },
 
       tableData: [],
@@ -228,7 +278,7 @@ export default {
     }
   },
   components: {
-    natForm
+    travelForm
   },
   async created () {
 
@@ -285,12 +335,12 @@ export default {
 
     handleScheduledTimeChange (time) {
       if (time) {
-        this.formData.scheduledStartTime = time[0]
-        this.formData.scheduledEndTime = time[1]
+        this.formData.startDate = time[0]
+        this.formData.endDate = time[1]
 
       } else {
-        this.formData.scheduledStartTime = ''
-        this.formData.scheduledEndTime = ''
+        this.formData.startDate = ''
+        this.formData.endDate = ''
 
       }
 
@@ -376,15 +426,12 @@ export default {
 
     //重置搜索条件
     resetSearch () {
-      this.formData = {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
-      }
+      this.$refs.ref_searchform.resetFields()
+      this.formData.startDate = ''
+      this.formData.endDate = ''
+      this.timeRange = []
       this.pageSize = 10
-      this.pageNo = 0
+      this.pageNo = 1
       this.loadTable()
     },