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

src/views/modules/base/collect.vue

@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
          <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item label="所在社区" prop="orgId">
+           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
             <el-select
                   v-model.trim="fmData.orgId"
                   placeholder="所在社区"
@@ -83,7 +83,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 3">未接种</span>
+            <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->