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

@@ -31,14 +31,33 @@
         <div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div>
         <div>
           <el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;">
-            <el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true">
+            <el-table-column
+              prop="name"
+              label="随访计划名称"
+              min-width="180"
+              align="left"
+              :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-button class="btn-right-class" type="text" @click="visitDetail(scope.row)">{{scope.row.name}}</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="startYear" label="开始年份" min-width="100" align="center"></el-table-column>
-            <el-table-column prop="num" label="总人数" min-width="150" align="center"></el-table-column>
-            <el-table-column label="操作" fixed="right" align="center" min-width="240">
+            <el-table-column
+              prop="startYear"
+              label="开始年份"
+              width="150"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="num"
+              label="总人数"
+              width="150"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              fixed="right"
+              align="center"
+              width="250">
               <template slot-scope="scope">
                 <el-button class="btn-right-class" type="text" @click="visitRow(scope.row)">查看居民</el-button>|
                 <el-button class="btn-right-class" type="text" @click="changeRow(scope.row)"> 修改</el-button>|

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

@@ -192,23 +192,28 @@
               //校验额度是否不够
               getCheckReservation({
                 content: '',
-                validContents: this.validContents
+                validContents: _self.validContents
               }).then(({data}) => {
                 const sendFlagLast = data.sendFlag;
+                const inServiceTimeFlag = data.inServiceTimeFlag;
                 if(sendFlagLast){ //额度还可用
                   sendReservation({
                     ...this.reservationForm,
-                    patientAppointList: this.selectList
+                    patientAppointList: _self.selectList
                   }).then(({data}) => {
-                    this.$refs['reservationForm'].resetFields();
-                    this.$emit('closeSendReserve',false);
+                    _self.$refs['reservationForm'].resetFields();
+                    _self.$emit('closeSendReserve',false);
                   })
                 }else {
-                  console.log('余额不足')
+                  if(!inServiceTimeFlag) {
+                    _self.$message.warning('已超过发送时间范围!');
+                    return;
+                  }else {
                     //  额度不足
-                  this.isNoEnoughShow = true;
+                    _self.isNoEnoughShow = true;
                     return;
                   }
+                }
               })
             } else {
               return false;

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

@@ -281,13 +281,18 @@
           content: '',
           validContents:this.validContents
         })
-        const { sendFlag } = this.checkRevervationData
+        const { sendFlag, inServiceTimeFlag } = this.checkRevervationData
         //判断短信余额是否不足
         if(sendFlag){
           this.isDialogShow = true;
+        }else {
+          if(!inServiceTimeFlag) {
+            this.$message.warning('已超过发送时间范围!');
+            return;
           }else {
             this.isNoEnoughShow = true;
           }
+        }
       },
        sendReservation() {
         if(this.selectionData.length > 0){