Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1465,6 +1465,11 @@
     },
     data() {
       return {
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          }
+        },
         GroupTypeVisible: false,
         GroupTypeObj: {},
         dialog: {
@@ -1704,10 +1709,18 @@
         pickerBeginDateBefore: {
           disabledDate: time => {
             if (this.queryMsg.EndGroupDate == null) {
-              return false;
+              if(this.queryMsg.StartGroupDate){
+                let endTime = this.TourDateRestrictions()
+                return time && endTime.getTime() >= time.getTime();
+              }else return false;
             } else {
-              let endTime = new Date(this.queryMsg.EndGroupDate);
-              return endTime.getTime() < time.getTime();
+              if(this.queryMsg.StartGroupDate){
+                let endTime = this.TourDateRestrictions()
+                return time && endTime.getTime() >= time.getTime();
+              }else{
+                let endTime = new Date(this.queryMsg.EndGroupDate);
+               return endTime.getTime() < time.getTime();
+              }
             }
           }
         },
@@ -1837,7 +1850,7 @@
             resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
           }
         }
-        //订房推送 
+        //订房推送
         else if (type == 1) {
           if (item.IsPush == 1) {
             resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';