页面修改

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -940,23 +940,28 @@
     cursor: pointer;
     width: 60px;
   }
-  .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
-    float:left;
+
+  .RegistrationList .leftSetInfo,
+  .RegistrationList .GO_TPright {
+    float: left;
   }
-  .RegistrationList .GO_Title{
+
+  .RegistrationList .GO_Title {
     display: inline-block;
     margin-top: 10px;
-    padding-right:10px;
-    font-size:12px;
+    padding-right: 10px;
+    font-size: 12px;
     width: 90px;
     text-align: right;
   }
-  ._TravelPricePopover .GOScenicDiv{
+
+  ._TravelPricePopover .GOScenicDiv {
     width: 500px;
     max-height: 400px;
     overflow: auto;
   }
-  ._TravelPricePopover table{
+
+  ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
@@ -966,13 +971,13 @@
     width: 100%;
   }
 
-  ._TravelPricePopover table ._color_666{
+  ._TravelPricePopover table ._color_666 {
     background-color: #ededed;
     color: #666666;
     padding: 5px;
   }
 
-  ._TravelPricePopover table td{
+  ._TravelPricePopover table td {
     background-color: #ffffff;
     padding: 9px 0;
     color: #333333;
@@ -983,6 +988,7 @@
   ._TravelPricePopover table td._d_name {
     background-color: #ededed;
   }
+
   .RegistrationList .SimulateDrop-box {
     width: 230px;
     min-height: 34px;
@@ -991,13 +997,15 @@
     float: left;
     margin-top: 4px;
     border: 1px solid #d1d1d1;
-}
-  .RegistrationList .GO_SimulaDrop{
+  }
+
+  .RegistrationList .GO_SimulaDrop {
     position: absolute;
-    right:10px;
-    top:5px;
-    color:#d1d1d1;
+    right: 10px;
+    top: 5px;
+    color: #d1d1d1;
   }
+
   .RegistrationList .SD_flight {
     display: inline-block;
     height: 24px;
@@ -1006,7 +1014,7 @@
     max-width: 200px;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size:12px;
+    font-size: 12px;
     padding: 0 8px;
     line-height: 22px;
     background-color: #f0f2f5;
@@ -4858,8 +4866,6 @@
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;
               this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
-
-              console.log(res,'resssssss');
             }
           },
           err => {}
@@ -5063,35 +5069,44 @@
           err => {}
         );
       },
-      getStartOrEndDate(time1,time2,time){
-          var time = time;
-          var date1 = Date.parse(new Date(time1.replace(/-/g, '/')));
-          var date2 = Date.parse(new Date(time2.replace(/-/g, '/')));
-          if (date1<time&&date2>time) {
-              return true;
-          };
-          return false;
+      getStartOrEndDate(start1, end1, start2, end2) {
+        var startdate1 = new Date(start1.replace("-", "/").replace("-", "/"));
+        var enddate1 = new Date(end1.replace("-", "/").replace("-", "/"));
+        var startdate2 = new Date(start2.replace("-", "/").replace("-", "/"));
+        var enddate2 = new Date(end2.replace("-", "/").replace("-", "/"));
+        //startdate1介于另一个区间之间
+        if (startdate1 >= startdate2 && startdate1 <= enddate2) { 
+          return true;
+        }
+         //enddate1介于另一个区间之间
+        if (enddate1 >= startdate2 && enddate1 <= enddate2) {
+          return true;
+        }
+        //startdate1-enddate1的区间大于另一个区间，且另一个区间在startdate1-enddate1之间
+        if (startdate1 <= startdate1 && enddate1 >= enddate2) {
+          return true;
+        }
+
+        return false;
       },
       //确定设置领队
       setTheLeader() {
-        let isCked=false;
-        console.log(this.ConfigData.Config.StartDate);
-        console.log(this.ConfigData.Config.EndDate);
-        this.LeaderHolidyList.forEach(x=>{
-          if(!isCked && (this.getStartOrEndDate(this.ConfigData.Config.StartDate,this.ConfigData.Config.EndDate,x.StartDateStr2)|| this.getStartOrEndDate(this.ConfigData.Config.StartDate,this.ConfigData.Config.EndDate,x.EndDateStr2))){
-            isCked=true;
+        let isCked = false;
+        this.LeaderHolidyList.forEach(x => {
+          if (!isCked && this.getStartOrEndDate(this.ConfigData.Config.StartDate, this.ConfigData.Config.EndDate, x.StartDateStr2,x.EndDateStr2)) {
+            isCked = true;
           }
         })
-        if(isCked){
+        if (isCked) {
           var that = this;
-          that.Confirm("该领队在请假期，是否继续?", function() {
+          that.Confirm("该领队在请假期，是否继续?", function () {
             that.getLeader();
           })
-        }else{
+        } else {
           this.getLeader();
         }
       },
-      getLeader(){
+      getLeader() {
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost(