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

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

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

@@ -105,7 +105,8 @@
         this.$emit('continueAdd', false)
       },
       handleSizeChangePre(val) {
-        this.paginationSet.pageSize = val
+        this.paginationSet.pageSize = val;
+        this.paginationSet.pageNum = 1;
         this.eachHasSelectedList = this.getPageList(this.hasSelectedList)
       },
       handleCurrentChangePre(val) {

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

@@ -161,10 +161,10 @@
         this.$emit('closeSelectCartoon', this.sendObj)
       },
       sureSelect() {
+        console.log(this.sendObj)
         this.$emit('closeSelectCartoon', this.sendObj);
       },
       changeComent(item){
-        console.log(item)
         this.$emit('pushConmentMsg',item)
       }
     },

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

@@ -319,7 +319,7 @@
     },
     watch: {
       planDetail(val) {
-        console.log(val)
+//        console.log(val)
         this.planDetailData = val
         this.setTimeNodeList = val.fPlanTimeReqList
         if(this.planDetailData.resourceId){