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

@@ -14,7 +14,7 @@
           <el-button class="button-white" plain @click="finishFollowup">结束随访</el-button>
         </div>
       </div>
-      <div class="base-info">
+      <div class="base-info" v-if="residentDetail.fPlanPatientDatilDtoList">
         <div class="resident-info base-content">
           <div class="content-div">
             <div class="c-title">姓名：</div>
@@ -62,7 +62,7 @@
           </div>
         </div>
       </div>
-      <div class="time-nodes">
+      <div class="time-nodes" v-if="residentDetail.fPlanPatientDatilDtoList">
         <p class="title">随访时间节点</p>
         <el-radio-group v-model="timeNodes">
           <el-radio-button :key="item.nodeId" v-for="item in residentDetail.fPlanPatientDatilDtoList.timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button>

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

@@ -95,6 +95,7 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination">
           <el-pagination
             background
             v-if="residentList.fPlanPatientInfoDtoList"
@@ -108,6 +109,7 @@
           </el-pagination>
         </div>
       </div>
+    </div>
     <change-plan :showThisPage="showChangePlan" @closeChangePlan="closeChangePlan"></change-plan>
     <finish-followup :showThisPage="showFinishFollowup" @closeFinishFollowup="closeFinishFollowup"></finish-followup>
   </div>

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

@@ -103,6 +103,7 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination">
           <el-pagination
             background
             v-if="reservationList.fPlanAppointmentDtoList"
@@ -116,6 +117,7 @@
           </el-pagination>
         </div>
       </div>
+    </div>
     <send-reservation :isDialogShow="isDialogShow" @closeSendReserve="closeSendReserve"></send-reservation>
     <no-enough :isNoEnoughShow="isNoEnoughShow" @closeTipsDialog="closeTipsDialog"></no-enough>
     <change-reservation :isChangeReservation="isChangeReservation" @closeChangeReserve="closeChangeReserve"></change-reservation>