From 0bbe9536387b2e34d3f436f655d9cc3d0ed8d841 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 12 Apr 2022 17:00:34 +0800
Subject: [PATCH] dd

---
 src/views/modules/base/epidemic/travel.vue     |  6 +++++-
 src/views/modules/base/epidemic/travelForm.vue | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index 8223ab3b..fac30f52 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -163,13 +163,16 @@
                          label="现居地"
                          show-overflow-tooltip
                          min-width="160">
+          <template slot-scope="scope">
+            {{scope.row.presentAddress + scope.row.detailAddress}}
+          </template>
         </el-table-column>
         <el-table-column prop="sourceAddress"
                          header-align="center"
                          align="center"
                          label="来自地区"
                          show-overflow-tooltip
-                         min-width="160">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="arriveDate"
                          header-align="center"
@@ -415,6 +418,7 @@ export default {
 
 
     const { user } = this.$store.state
+    console.log('user-----', user)
     this.agencyId = user.agencyId
 
 
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index c6d1f6fc..456b2fc4 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -319,6 +319,7 @@ export default {
         ]
       },
       areaProps: {
+        // checkStrictly: true,
         lazy: true,
         lazyLoad: this.lzayLoadArea
       }
@@ -332,7 +333,9 @@ export default {
     //获取网格下拉框数据
     await this.loadGrid()
   },
-
+  destroyed() {
+    this.nowAllCode = []
+  },
   methods: {
     computedWd(val) {
       const len = val.length
@@ -358,7 +361,10 @@ export default {
         
         if (row.userType == 'icresi') this.isFromResi = true
         else this.nowAllCode = row.presentAddressPathCode && row.presentAddressPathCode.split(',')
-      }
+      } else {
+        const { user } = this.$store.state
+        this.nowAllCode = user.areaCodePath
+      } 
       // this.$refs['ref_form'].resetFields();
 
       console.log('formtype', type)
@@ -371,14 +377,17 @@ export default {
       this.formData.idCard = ''
       this.formData.gridId = ''
       this.formData.userId = ''
+      this.resetData()
       if (value === '2') {
         this.isFromResi = true
         this.formData.userType = 'icresi'
       } else {
         this.isFromResi = false
         this.formData.userType = 'input'
+        const { user } = this.$store.state
+        this.nowAllCode = user.areaCodePath
       }
-      this.resetData()
+      
 
     },
     handleSourceArea(val) {