Merge branch 'dev-220411' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-220411

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
 
 

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) {