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/reservation-manage/reservation-list.vue

@@ -20,7 +20,7 @@
             </el-form-item>
             <el-form-item label="随访时间范围：" prop="planTimes" clearable>
               <el-date-picker
-                v-model="searchData.timeRange"
+                v-model="searchData.planTimes"
                 type="daterange"
                 size="small"
                 range-separator="至"
@@ -195,11 +195,14 @@
         this.searchData.planTimes = [this.$route.query.appointTime,this.$route.query.appointTime];
         this.getReservationList({
           planName: this.$route.query.planName,
-          planFromTime: this.$route.query.appointTime,
-          planToTime: this.$route.query.appointTime,
+          beginTime: this.$route.query.appointTime,
+          endTime: this.$route.query.appointTime,
+          status: this.status
         })
       } else {
-        this.getReservationList();
+        this.getReservationList({
+          status: this.status
+        });
       }
 
     },