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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -2055,7 +2055,7 @@
       },
       //跳转到团控列表
       gotoTravelList(item) {
-        var path = "/TravelControlList";
+        var path = "";
         //小包团
         if (item.TeamType == 1) {
           path = "/TravelControlListSale";
@@ -2071,6 +2071,8 @@
         //包机
         else if (item.TeamType == 4) {
           path = "/TravelTeam";
+        }else{
+          path = "/TravelControlList";
         }
         var params = {
           tcmun: item.TCNUM

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1564,14 +1564,17 @@
           this.queryMsg = this.$store.state.pageCondition;
         }
       }
-      var myDate = new Date();
-      var nowDate =
-        myDate.getFullYear() +
-        "-" +
-        parseInt(myDate.getMonth() + 1) +
-        "-" +
-        myDate.getDate();
-      this.queryMsg.StartGroupDate = nowDate;
+      if(!this.$route.query.tcmun){
+        var myDate = new Date();
+        var nowDate =
+          myDate.getFullYear() +
+          "-" +
+          parseInt(myDate.getMonth() + 1) +
+          "-" +
+          myDate.getDate();
+        this.queryMsg.StartGroupDate = nowDate;
+      }
+      
       if (
         this.queryCommonData.IsParentCompany != 1 &&
         userInfo.RB_Branch_id != 49