Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/follow/FollowList.vue

@@ -29,7 +29,7 @@
             <el-table-column prop="sexName" label="性别" width="50" align="center" />
             <el-table-column prop="birthDate" label="出生日期" width="90" align="center" />
             <el-table-column prop="age" label="年龄" width="50" align="center" />
-            <el-table-column prop="abnormalAsbitemDetail" label="组合项目异常" width="200">
+            <!-- <el-table-column prop="abnormalAsbitemDetail" label="组合项目异常" width="200">
               <template slot-scope="scope">
                 <div v-html="mergeSummarys(scope.row.abnormalAsbitemDetail,'asbitemName')"></div>
               </template>
@@ -38,7 +38,7 @@
               <template slot-scope="scope">
                 <div v-html="mergeSummarys(scope.row.abnormalItemDetail,'itemName')"></div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="isSmsComplete" label="短信随访创建完成" width="200">
               <!-- <template slot-scope="scope">
                 <el-checkbox v-model="scope.row.isSmsComplete" disabled true-label="Y" false-label="N"></el-checkbox>