Merge branch 'dev-followUp-20190312' of...

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

src/views/followup/plan-manage/dialog/change-plan.vue

@@ -121,6 +121,7 @@
             labelId: nodeItem[0].labelId,
             label: nodeItem[0].labelName,
           }
+
           _this.selectedGroup.push(pushItem)
         })
       },
@@ -189,8 +190,7 @@
     watch: {
       planChangeData(val) {
         const _this = this
-        let labelList = val.yLabelList
-        console.log()
+        let labelList = val.yLabelList;
         labelList.forEach(function (item, index) {
           let nodeItem  =  _this.groupList.filter(function(item1){
             return item1.labelId == item;
@@ -198,8 +198,14 @@
           let pushItem = {
             labelId: nodeItem[0].labelId,
             label: nodeItem[0].labelName,
-          }
+          };
+
+          const isPush = _this.selectedGroup.filter(function(t){
+            return t.labelId == pushItem.labelId;
+          })
+          if(!isPush.length) {
             _this.selectedGroup.push(pushItem)
+          }
         })
       },
       groupList(val) {

src/views/followup/plan-manage/dialog/select-patient.vue

@@ -7,7 +7,7 @@
       :before-close="clickClose"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="65%"
+      width="950px"
       top="2%"
       center>
       <div class="finish-content">
@@ -68,7 +68,7 @@
           ref="multipleTable"
           center
           style="width: 100%;margin-top: 20px;"
-          height="60%"
+          height="280"
           :row-key="getRowKeys"
           @selection-change="handleSelectionChange">
           <el-table-column
@@ -102,12 +102,14 @@
             prop="showDiseaseNames"
             label="基础疾病"
             align="center"
+            width="200"
             :show-overflow-tooltip="true">
           </el-table-column>
           <el-table-column
             prop="showLabelName"
             label="分组"
             align="center"
+            width="200"
             :show-overflow-tooltip="true">
           </el-table-column>
         </el-table>
@@ -422,7 +424,17 @@
     .el-dialog__wrapper {
       overflow: hidden;
       .el-dialog--center {
-        height: 90%;
+        height: 580px;
+        .el-table--scrollable-y,.el-table__body-wrapper {
+          &::-webkit-scrollbar{
+            width:5px;
+          }
+          &::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+            border-radius: 10px;
+            -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+            background: rgba(0,0,0,0.1);
+          }
+        }
         /*.el-dialog__body {
           max-height: 80%;
           overflow: hidden;