Merge branch 'dev-fangyi' into test

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

@@ -368,7 +368,7 @@
         </el-form>
         <div style="padding: 0 20px;">
           <el-tabs v-model="activeName">
-            <!-- <el-tab-pane label="疫苗接种信息" name="first">
+            <el-tab-pane label="疫苗接种信息" name="first">
               <el-table class="table"
                   :data="vaccineList"
                   border
@@ -400,7 +400,7 @@
                                 width="240">
                 </el-table-column>
               </el-table>
-            </el-tab-pane> -->
+            </el-tab-pane>
             <el-tab-pane label="核酸检测信息" name="second">
               <el-table class="table"
                   :data="natList"
@@ -510,7 +510,7 @@ export default {
       pageSize: 20,
       pageNo: 0,
       tableLoading: false,
-      activeName: 'second',
+      activeName: 'first',
       agencyId: '',
       sHeight: 0,
       timeRange: [],

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

@@ -193,7 +193,7 @@
             </el-checkbox-group>
           </el-form-item>
 
-          <el-form-item label="通知内容"
+          <el-form-item v-show="formData.channel.length > 0" label="通知内容"
                         prop="content"
                         label-width="150px"
                         style="display: block">

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

@@ -176,14 +176,14 @@
                          label="疫苗厂家"
                          min-width="180">
         </el-table-column>
-        <!-- <el-table-column v-if="isResiUser"
+        <el-table-column v-if="isResiUser"
                          prop="isResiUserShow"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="本辖区居民"
                          width="120">
-        </el-table-column> -->
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"