Merge branch 'dev-fangyi' into test

src/views/modules/base/epidemic/travel.vue

@@ -43,15 +43,15 @@
         <div>
           
           <el-form-item label="来自地区"
-                        prop="sourceAddressCode">
-            <!-- <el-input v-model="formData.sourceAddressCode"
+                        prop="sourceAddress">
+            <el-input v-model="formData.sourceAddress"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入姓名">
-            </el-input> -->
-            <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" 
-              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader>
+                      placeholder="请输入地区">
+            </el-input>
+            <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" 
+              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> -->
           </el-form-item>
 
           <el-form-item label="来到本地时间"
@@ -215,7 +215,8 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button  v-if="scope.row.userType != 'resi'" type="text"
+                       <!-- v-if="scope.row.userType != 'resi'"  -->
+            <el-button  type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -381,6 +382,7 @@ export default {
         name: '',//负责人		
         mobile: '',//联系电话	
         idCard: '',
+        sourceAddress: '',
         sourceAddressCode: '',
         startDate: '',
         endDate: ''