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

@@ -125,8 +125,8 @@
         })
       },
       selectPlan(val) {
-        const arr = this.planOption.filter((item=>{return item.id == val}));
-        this.selectPlan = arr[0].name
+        let arr = this.planOption.filter((item=>{return item.id == val}));
+        this.selectPlanName = arr[0].name
       },
       clickClose() {
         this.$emit('closeChangePlan',false);

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

@@ -7,8 +7,8 @@
       :before-close="clickClose"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      top="25px"
       width="65%"
+      top="2%"
       center>
       <div class="finish-content">
         <el-form
@@ -16,7 +16,6 @@
           :model="searchData"
           :inline="true"
           class="select-width"
-
           size="small">
           <el-form-item>
             <el-select v-model="searchData.sex" @change="changeSex" >
@@ -69,6 +68,7 @@
           ref="multipleTable"
           center
           style="width: 100%;margin-top: 20px;"
+          height="60%"
           :row-key="getRowKeys"
           @selection-change="handleSelectionChange">
           <el-table-column
@@ -422,22 +422,20 @@
     .el-dialog__wrapper {
       overflow: hidden;
       .el-dialog--center {
-        height: 95%;
-        .el-dialog__body {
+        height: 90%;
+        /*.el-dialog__body {
           max-height: 80%;
-          overflow-y: scroll;
-          &::-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);
-          }
+          overflow: hidden;
           .finish-content {
             height: 100%;
+            .el-table {
+              .el-table--scrollable-y .el-table__body-wrapper {
+                height: 80%;
+              }
             }
+
           }
+        }*/
       }
 
     }