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

@@ -169,10 +169,12 @@
           pageNo: currentPage || this.paginationSet.pageNo,
           pageSize: this.paginationSet.pageSize,
         });
-        if(this.recordList.enteringDtos.length > 0) {
-          this.hasData = true;
-        }else {
-          this.hasData = false;
+        if(this.recordList.enteringDtos){
+          if(this.recordList.enteringDtos.length > 0) {
+            this.hasData = true;
+          }else {
+            this.hasData = false;
+          }
         }
         const {pageNo, pageSize, count, finishedCount, unfinishedCount} = this.recordList;
         if(this.activeName == ''){
@@ -237,8 +239,8 @@
         this.isShowChangeDialog = true;
       },
       sendRow(row){
-        // let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&token=D74A6C7C61564EB1B3DC83251F33D173`);
-        let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&token=${this._token}`);
+        let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&nickname=${row.nickname}&token=${this._token}`);
+        // let saasUrl = getSaasDomain(`/pica-frontend/patientEduManage/pica_patient_edu_manage.html#/pageTab/message?patientId=${row.patientId}&nickname=${row.nickname}&token=8143DC2A026B4602BF7B746FB5AEE9A1`);
         window.open(saasUrl)
       },
       handleSizeChangePre(pageSize){

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

@@ -53,7 +53,7 @@
         </div>
         <div class="item">
           <span class="title">本次推送:</span>
-          <p>{{checkData.sendWechatAppointSize + checkData.sendMobileAppointSize}}条（微信不限额推送{{checkData.sendWechatAppointSize}}条；使用短信额度推送{{checkData.sendMobileAppointSize}}条）</p>
+          <p>{{checkData.sendWechatAppointSize + checkData.sendMobileSmsCount}}条（微信不限额推送{{checkData.sendWechatAppointSize}}条；使用短信额度推送{{checkData.sendMobileSmsCount}}条）</p>
         </div>
         <div class="item">
           <span class="title">推送成功后剩余额度:</span>