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/dialog/followupDetail.vue

@@ -48,7 +48,11 @@
             <div class="c-title">随访方式：</div>
             <div class="c-content">{{enteringInfo.fuPlanType}}</div>
           </div>
-          <div class="content-div">
+          <div class="content-div" v-if="enteringInfo.executePlanTime">
+            <div class="c-title">实际随访时间：</div>
+            <div class="c-content">{{enteringInfo.executePlanTime}}</div>
+          </div>
+          <div class="content-div" v-else>
             <div class="c-title">计划随访时间：</div>
             <div class="c-content">{{enteringInfo.fuPlanTime}}</div>
           </div>

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

@@ -184,15 +184,20 @@
         }
         this.$emit('closeSendReserve',false)
       },
-      closeSendReserve(formName){
-          this.$refs[formName].validate((valid) => {
-            if (valid) {
-              //校验额度是否不够
-              this.getCheckReservation({
+      async initLastCheck() {
+        await this.getCheckReservation({
           content: '',
           validContents: this.validContents
         })
-              const { sendFlag } = this.checkRevervationData;
+      },
+      closeSendReserve(formName){
+        let _self = this;
+        _self.$refs[formName].validate((valid) => {
+            if (valid) {
+              //校验额度是否不够
+               _self.initLastCheck();
+              const { sendFlag } = _self.checkRevervationData;
+              console.log('sendFlag',sendFlag)
               if(sendFlag){ //额度还可用
                 sendReservation({
                   ...this.reservationForm,
@@ -202,8 +207,10 @@
                   this.$emit('closeSendReserve',false);
                 })
               }else {
+                console.log('余额不足')
               //  额度不足
                 this.isNoEnoughShow = true;
+                return;
               }
             } else {
               return false;