Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

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"
@@ -43,7 +51,8 @@
             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">
@@ -85,6 +94,23 @@
       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.labelId = groupNames.join('、');
+          } else if(item.labelId){
+            item.labelId = item.labelId;
+            // item.labelId = '-';
+          }else {
+            item.labelId = '-';
+          }
+        });
+      }
       this.eachHasSelectedList = this.getPageList(this.hasSelectedList)
       const totalLength = this.hasSelectedList.length
       this.paginationSet.total = totalLength

src/views/layout/slidebar.vue

@@ -240,6 +240,7 @@ export default {
           background: url('../../assets/image/patients-icon.png');
           margin: 0 8px 0 3px ;
           background-size: 17px 17px;
+          opacity: 0.6;
         }
         .set-normal-background{
           background: #06232C;

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

@@ -43,7 +43,7 @@
                   collapse-tags
                   filterable
                   placeholder="请选择年龄段"
-                  class="init-width"
+                  class="init-width2"
                   clearable>
                   <el-option
                     v-for="(item,index) in ageOptions"
@@ -58,6 +58,7 @@
                   v-model="searchData.diseaseId"
                   multiple
                   collapse-tags
+                  filterable
                   placeholder="请选择诊断"
                   class="set-width"
                   clearable>
@@ -184,6 +185,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">
@@ -562,6 +567,12 @@
       width: 100px!important;
     }
   }
+  .init-width2{
+    width: 110px !important;
+    .el-input{
+      width: 110px!important;
+    }
+  }
   .set-width{
     width: 150px !important;
     .el-input{
@@ -617,7 +628,7 @@
     }
     .el-select__tags-text{
       display: inline-block;
-      max-width: 86px;
+      max-width: 70px;
       overflow: hidden;
       text-overflow:ellipsis;
       white-space: nowrap;