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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1919,7 +1919,9 @@
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }
-
+      if (this.$route.query.TCID) {
+        this.queryMsg.TCID = this.$route.query.TCID;
+      }
       if (userInfo.IsParentCompany == undefined) {
         this.queryCommonData.IsParentCompany = 2;
       } else {

src/components/dmc/manager/GroupOutCorporationAudit.vue

@@ -315,24 +315,34 @@
             this.Error(res.data.message);
           }
           this.loading = false
-          }
-        );
+        });
       },
       goTravel(item) { //跳转到团队列表
         var newPath = "TravelControlList";
+        var query = {
+          TCID: item.TCID,
+          blank: 'y',
+          tab: '团控列表'
+        };
         if (item.TeamType == 1) {
-          newPath = "TravelControlListSale"
+          newPath = "TravelControlListSale";
+          query = {
+            TCID: item.TCID,
+            blank: 'y',
+            tab: '团控列表'
+          };
         }
         if (item.TeamType == 2) {
-          newPath = "oneDayTrip"
-        }
-        this.$router.push({
-          path: newPath,
-          query: {
-            TCID: item.TCID,
+          newPath = "oneDayTrip";
+          query = {
+            id: item.TCID,
             blank: 'y',
             tab: '团控列表'
+          };
         }
+        this.$router.push({
+          path: newPath,
+          query: query
         });
       }
     }