已选居民分组显示问题

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

@@ -26,12 +26,20 @@
             label="年龄"
             align="center"
             min-width="70px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.age || scope.row.age===0">{{scope.row.age}}</span>
+              <span v-else>-</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="idNo"
             label="身份证号"
             align="center"
             min-width="220">
+            <template slot-scope="scope">
+              <span v-if="scope.row.idNo">{{scope.row.idNo}}</span>
+              <span v-else>-</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="mobilePhone"
@@ -40,10 +48,11 @@
             min-width="120">
           </el-table-column>
           <el-table-column
-            prop="showLabelName2"
+            prop="labelId"
             label="分组"
             align="center"
-            min-width="200">
+            min-width="200"
+            :show-overflow-tooltip="true">
           </el-table-column>
         </el-table>
         <el-row type="flex" justify="end" class="margin-top20">
@@ -93,9 +102,12 @@
             item.labelModels.forEach(item => {
               groupNames.push(item.label)
             });
-            item.showLabelName2 = groupNames.join('、');
-          } else {
-            item.showLabelName2 = '-';
+            item.labelId = groupNames.join('、');
+          } else if(item.labelId){
+            item.labelId = item.labelId;
+            // item.labelId = '-';
+          }else {
+            item.labelId = '-';
           }
         });
       }

src/views/patients/labels-manage/dialog/select-patitents.vue

@@ -184,6 +184,10 @@
             align="center"
             width="180"
             :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span v-if="scope.row.fuPlanName">{{scope.row.fuPlanName}}</span>
+              <span v-else>-</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-row type="flex" justify="space-between" align="middle" class="margin-top15">