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/utils/followup/followapis.js

@@ -129,12 +129,12 @@ export const getCheckReservation = (params) => {
     description: '发送预约校验',
   })
 };
-export const getReservationPatients = (params) => {
+export const getReservationPatients = (data) => {
   return fetch({
     headers,
-    url: getFollowUpSC(`/followup/appointmentPatient/accept/`),
-    method: 'get',
-    params: params,
+    url: getFollowUpSC(`/followup/appoint/appointed/count`),
+    method: 'post',
+    data: data,
     description: '查看预约人数',
   })
 };

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

@@ -14,7 +14,7 @@
         label-suffix=":"
         label-width="120px">
         <el-form-item label="变更居民">
-          <span>{{reservationForm.nickName}}</span>
+          <span>{{reservationForm.nickname}}</span>
         </el-form-item>
         <el-form-item label="预约状态" required prop="appointStatus">
           <el-radio-group v-model="reservationForm.appointStatus">

src/views/followup/reservation-manage/reservation-list.vue

@@ -313,7 +313,7 @@
       changeReserveClick(row){
         // this.needPara = row;
         this.needPara = {
-          nickName: row.nickName,
+          nickname: row.nickname,
           appointmentDate: '',
           appointmentRange: '',
           planId: row.planId,