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

@@ -295,44 +295,54 @@
         }
         this.loading = true
         this.apipost("travel_post_AuditPriceOutBranchTeamType", {
-            TCID: TCID,
-            BranchAuditState: type,
-            BranchAuditRemark: this.cancelRemark
-          }, res => {
-            if (res.data.resultCode == 1) {
-              if (!name) {
+          TCID: TCID,
+          BranchAuditState: type,
+          BranchAuditRemark: this.cancelRemark
+        }, res => {
+          if (res.data.resultCode == 1) {
+            if (!name) {
+              this.cancelOrderDialog = false
+              this.Success(res.data.message);
+              this.getList()
+            } else {
+              if (length) {
                 this.cancelOrderDialog = false
                 this.Success(res.data.message);
                 this.getList()
-              } else {
-                if (length) {
-                  this.cancelOrderDialog = false
-                  this.Success(res.data.message);
-                  this.getList()
-                }
               }
-            } else {
-              this.Error(res.data.message);
             }
-            this.loading = false
+          } else {
+            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"
+          newPath = "oneDayTrip";
+          query = {
+            id: item.TCID,
+            blank: 'y',
+            tab: '团控列表'
+          };
         }
         this.$router.push({
           path: newPath,
-          query: {
-            TCID: item.TCID,
-            blank: 'y',
-            tab: '团控列表'
-          }
+          query: query
         });
       }
     }