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

src/components/follow/FollowList.vue

@@ -31,16 +31,12 @@
             <el-table-column prop="age" label="年龄" width="50" align="center" />
             <el-table-column prop="abnormalAsbitemDetail" label="组合项目异常" width="200">
               <template slot-scope="scope">
-                <div v-for="(item,index) in scope.row.abnormalAsbitemDetail" :key="index">
-                  {{item.asbitemName+' '+item.isCriticalValue+' '+item.isReview}}
-                </div>
+                <div v-html="mergeSummarys(scope.row.abnormalAsbitemDetail,'asbitemName')"></div>
               </template>
             </el-table-column>
             <el-table-column prop="abnormalItemDetail" label="项目异常" width="200">
               <template slot-scope="scope">
-                <div v-for="(item,index) in scope.row.abnormalItemDetail" :key="index">
-                  {{item.itemName+' '+item.isCriticalValue+' '+item.isReview}}
-                </div>
+                <div v-html="mergeSummarys(scope.row.abnormalItemDetail,'itemName')"></div>
               </template>
             </el-table-column>
             <el-table-column prop="isSmsComplete" label="短信随访创建完成" width="200">
@@ -55,7 +51,7 @@
             </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>
+                <div v-html="scope.row.criticalValueContents"></div>
               </template>
             </el-table-column>
             <el-table-column prop="jobCardNo" label="工卡号" width="90" align="center" />
@@ -373,7 +369,15 @@ export default {
     deepCopy,
     checkPagePriv,
     setPrStatusColor,
-
+    mergeSummarys(array,itemKey) {
+      let ret = ''
+      array.forEach((e, i) => {
+        let splitStr = "<br>"
+        if (i == 0) splitStr = ""
+        return ret += splitStr + e[itemKey]+' '+e.isCriticalValue+' '+e.isReview
+      })
+      return ret
+    },
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
       // highLightBg 为 'selected'的高亮