From 08222be6a07eea9c3d3ca5a0f48f1540ccecfeaa Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 3 Nov 2022 10:17:23 +0800
Subject: [PATCH] 111

---
 src/views/modules/base/epidemic/travel.vue    | 21 ++++++
 .../modules/base/epidemic/travelForm.vue      | 68 ++++++++++++-------
 2 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index dc69ea127..8b0f6cf57 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -178,6 +178,27 @@
                          show-overflow-tooltip
                          min-width="180">
         </el-table-column>
+        <el-table-column prop="sourceDetailAddress"
+                         header-align="center"
+                         align="center"
+                         label="详细地址"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="vaccineNumName"
+                         header-align="center"
+                         align="center"
+                         label="疫苗针次"
+                         show-overflow-tooltip
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="isNatRecordName"
+                         header-align="center"
+                         align="center"
+                         label="48小时核酸"
+                         show-overflow-tooltip
+                         min-width="110">
+        </el-table-column>
         <el-table-column prop="arriveDate"
                          header-align="center"
                          align="center"
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index c3d312a89..c022c6b17 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -134,29 +134,29 @@
           </el-input>
         </el-form-item>
         <el-form-item label="返回交通方式"
-                      prop="tranId"
+                      prop="trafficType"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.tranId"
+                     v-model.trim="formData.trafficType"
                      placeholder="请选择"
                      clearable>
-            <el-option v-for="item in tranList"
+            <el-option v-for="item in trafficTypeList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="formData.tranId==='4'"
+        <el-form-item v-if="formData.trafficType==='4'"
                       label="其他"
-                      prop="tranOther"
+                      prop="trafficTypeExplain"
                       style="display: block"
                       label-width="150px">
           <el-input class="item_width_2"
                     placeholder="请输入交通方式"
                     clearable
-                    v-model="formData.tranOther">
+                    v-model="formData.trafficTypeExplain">
           </el-input>
         </el-form-item>
         <el-form-item label="来自地区"
@@ -193,11 +193,11 @@
         </el-form-item>
 
         <el-form-item label="疫苗接种针次"
-                      prop="ym"
+                      prop="vaccineNum"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.ym"
+                     v-model.trim="formData.vaccineNum"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in ymList"
@@ -210,10 +210,10 @@
 
         <el-form-item label="48小时核酸记录"
                       style="display: block"
-                      prop="hs"
+                      prop="isNatRecord"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.hs"
+                     v-model.trim="formData.isNatRecord"
                      placeholder="请选择"
                      clearable>
             <el-option v-for="item in hsList"
@@ -381,10 +381,10 @@ export default {
         content: '',
         channel: [],
 
-        tranId: '',
-        tranOther: '',
-        hs: '',
-        ym: '',
+        trafficType: '',
+        trafficTypeExplain: '',
+        isNatRecord: '',
+        vaccineNum: '',
 
       },
       dataRule: {
@@ -409,18 +409,18 @@ export default {
         arriveDate: [
           { required: true, message: '来到本地时间不能为空', trigger: 'change' },
         ],
-        tranId: [
+        trafficType: [
           { required: true, message: '交通方式不能为空', trigger: 'change' },
         ],
-        tranOther: [
+        trafficTypeExplain: [
           { required: true, message: '其他交通方式不能为空', trigger: 'change' },
         ],
-        hs: [
-          { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
-        ],
-        ym: [
-          { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
-        ]
+        // isNatRecord: [
+        //   { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
+        // ],
+        // vaccineNum: [
+        //   { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
+        // ]
       },
       areaProps: {
         // checkStrictly: true,
@@ -428,7 +428,7 @@ export default {
         lazyLoad: this.lzayLoadArea
       },
 
-      tranList: [
+      trafficTypeList: [
         {
           value: '0',
           label: '飞机'
@@ -451,6 +451,10 @@ export default {
         },
       ],
       ymList: [
+        {
+          value: '0',
+          label: '0针'
+        },
         {
           value: '1',
           label: '1针'
@@ -483,6 +487,7 @@ export default {
     this.agencyId = user.agencyId
     //获取网格下拉框数据
     await this.loadGrid()
+    this.getTrafficType()
   },
   destroyed () {
     this.nowAllCode = []
@@ -588,6 +593,23 @@ export default {
         this.$message.error(msg)
       }
 
+    },
+    async getTrafficType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: "traffic_type",
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.trafficTypeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
     },
     async handleSelGrid (value) {