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/plan-detail.vue

@@ -49,7 +49,7 @@
         <p class="title">随访时间节点</p>
         <div class="node-div">
           <el-radio-group v-model="timeNodes" size="small">
-            <el-radio-button :key="item.id" v-for="item in planDetail.fPlanTimeDtoList" :label="item.id">{{item.timeStr}}</el-radio-button>
+            <el-radio-button :key="item.id" v-for="item in planDetail.fPlanTimeReqList" :label="item.id">{{item.timeStr}}</el-radio-button>
           </el-radio-group>
         </div>
         <div class="followup-contents" v-if="nodeContent.length">
@@ -140,13 +140,13 @@
     },
     watch: {
       planDetail(val) {
-        if(val.fPlanTimeDtoList.length){
-          this.timeNodes = val.fPlanTimeDtoList[0].id
+        if(val.fPlanTimeReqList.length){
+          this.timeNodes = val.fPlanTimeReqList[0].id
         }
 
       },
       timeNodes(val) {
-        this.nodeContent =  this.planDetail.fPlanTimeDtoList.filter(function(item){
+        this.nodeContent =  this.planDetail.fPlanTimeReqList.filter(function(item){
           return item.id == val;
         });
       }
@@ -199,6 +199,20 @@
           padding: 25px;
 
         }
+        .node-div {
+          width: 100%;
+          overflow-x: scroll;
+          overflow-y: hidden;
+          white-space: nowrap;
+          &::-webkit-scrollbar{
+            height: 6px;
+          }
+          &::-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);
+          }
+        }
       }
     }
   }

src/views/followup/plan-manage/plan-modify.vue

@@ -135,7 +135,7 @@
         'getResidentList',
         'getRemarkOption',
         'getTimeNodeList',
-        'modifyFollowPlan'
+        'setFollowPlan'
       ]),
       selectPatientHandler() {
         this.isShowSelectPatient = true;
@@ -202,7 +202,7 @@
     watch: {
       planDetail(val) {
        // this.setTimeNodeList = val.fPlanTimeDtoList
-        this.setTimeNodeListOnCom(val.fPlanTimeDtoList)
+        this.setTimeNodeListOnCom(val.fPlanTimeReqList)
       },
     }
   }

src/views/followup/plan-manage/resident-detail.vue

@@ -64,9 +64,11 @@
       </div>
       <div class="time-nodes">
         <p class="title">随访时间节点</p>
-        <el-radio-group v-model="timeNodes" size="small">
-          <el-radio-button :key="item.nodeId" v-for="item in timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button>
-        </el-radio-group>
+        <div class="node-div">
+          <el-radio-group v-model="timeNodes" size="small">
+            <el-radio-button :key="item.nodeId" v-for="item in timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button>
+          </el-radio-group>
+        </div>
         <div class="followup-contents">
           <div class="content-div">
             <div class="c-title">随访方式：</div>
@@ -222,6 +224,20 @@
           padding: 25px;
 
         }
+        .node-div {
+          width: 100%;
+          overflow-x: scroll;
+          overflow-y: hidden;
+          white-space: nowrap;
+          &::-webkit-scrollbar{
+            height: 6px;
+          }
+          &::-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);
+          }
+        }
       }
     }
   }