Merge branch 'dev-patients-20190513' into 'release-0612'

Dev patients 20190513



See merge request !38

src/views/followup/plan-manage/dialog/has-selected-patient.vue

@@ -40,7 +40,7 @@
             min-width="120">
           </el-table-column>
           <el-table-column
-            prop="labelId"
+            prop="showLabelName2"
             label="分组"
             align="center"
             min-width="200">
@@ -85,6 +85,20 @@
       hasSelectedList: Array, // 所有已选人数
     },
     mounted() {
+      if(this.hasSelectedList.length){
+        this.hasSelectedList.forEach((item) => {
+          let groupNames = []
+          //转化分组
+          if(item.labelModels) {
+            item.labelModels.forEach(item => {
+              groupNames.push(item.label)
+            });
+            item.showLabelName2 = groupNames.join('、');
+          } else {
+            item.showLabelName2 = '-';
+          }
+        });
+      }
       this.eachHasSelectedList = this.getPageList(this.hasSelectedList)
       const totalLength = this.hasSelectedList.length
       this.paginationSet.total = totalLength