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

src/components/follow/FollowList.vue

@@ -53,6 +53,11 @@
                  <el-checkbox v-model="scope.row.isPhoneComplete" disabled true-label="Y" false-label="N"></el-checkbox>
               </template> -->
             </el-table-column>
+            <el-table-column prop="criticalValueContents" label="危急值(随访内容)" width="200">
+              <template slot-scope="scope">
+                <div v-html="scope.row.criticalValueContents.replace(/\n/g, '<br>')"></div>
+              </template>
+            </el-table-column>
             <el-table-column prop="jobCardNo" label="工卡号" width="90" align="center" />
             <el-table-column prop="medicalCardNo" label="体检卡号" width="90" align="center" />
             <el-table-column prop="maritalStatusName" label="婚姻状况" width="90" align="center" />