no message

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -354,15 +354,17 @@
           let name = ''
           if (row.OrderType == 5) {//签证
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'VisaProductEditOrder'
-            } else {
               name = 'VisaProductEditOrderOP'
+            } else {
+              name = 'VisaProductEditOrder'
             }
             this.$router.push({
               name: name,
             });
           } else if (row.OrderType == 1||row.OrderType == 6) { //跟团 一日游 团签
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+              name = 'enrollTotal'
+            }else{
               if (row.TravelType == 0) {//正规团
                 name = 'TravelControlList'
               }else if (row.TravelType == 2) {//当地游
@@ -373,24 +375,24 @@
             }
           } else if (row.OrderType == 2) { //酒店
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'singleProductHotelOrder'
-            } else {
               name = 'singleProductHotelOrderOP'
+            } else {
+              name = 'singleProductHotelOrder'
             }
           } else if (row.OrderType == 3) { //门票
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'SingleticketOrderList'
-            } else {
               name = 'SingleticketOrderListOP'
+            } else {
+              name = 'SingleticketOrderList'
             }
           } else if (row.OrderType == 4) { //包车
             if(row.CarType==''||row.CarType==null){
               this.GetAdminCarOrderPageList(row,url,href,data)
             }else{
               if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
-                name = 'CharterOrderList'
+                name = 'CharterOrderListOP'
               }else{
-                name= 'CharterOrderListOP'
+                name= 'CharterOrderList'
               }
               data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
             }
@@ -436,9 +438,9 @@
               OrderType = pageData[0].OrderType
             }
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'CharterOrderList'
-            } else {
               name = 'CharterOrderListOP'
+            } else {
+              name = 'CharterOrderList'
             }
             this.$router.push({
               name: name,

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -348,9 +348,9 @@
         if (row.OrderType == 1) {
 
           if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-            data[0].path = 'myCustomerOrderAllType'
-          } else {
             data[0].path = 'customerOrderAllType'
+          } else {
+            data[0].path = 'myCustomerOrderAllType'
           }
           href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
           window.open(href);
@@ -359,43 +359,43 @@
           let name = ''
           if (row.OrderType == 6) {
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'VisaProductEditOrder'
-            } else {
               name = 'VisaProductEditOrderOP'
+            } else {
+              name = 'VisaProductEditOrder'
             }
             this.$router.push({
               name: name,
             });
           } else if (row.OrderType == 2) { //跟团 一日游
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
+              name = 'enrollTotal'
+            } else {
               if (row.TravelType == 1) {
                 name = 'groupTourOrder'
               } else {
                 name = 'groupTourOrderOne'
               }
-            } else {
-              name = 'enrollTotal'
             }
           } else if (row.OrderType == 3) { //酒店
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'singleProductHotelOrder'
-            } else {
               name = 'singleProductHotelOrderOP'
+            } else {
+              name = 'singleProductHotelOrder'
             }
           } else if (row.OrderType == 4) { //门票
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'SingleticketOrderList'
-            } else {
               name = 'SingleticketOrderListOP'
+            } else {
+              name = 'SingleticketOrderList'
             }
           } else if (row.OrderType == 5) { //包车
             if(row.CarType==''||row.CarType==null){
               this.GetAdminCarOrderPageList(row,url,href,data)
             }else{
               if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
-                name = 'CharterOrderList'
+                name = 'CharterOrderListOP'
               }else{
-                name= 'CharterOrderListOP'
+                name= 'CharterOrderList'
               }
               data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
             }
@@ -448,9 +448,9 @@
               OrderType = pageData[0].OrderType
             }
             if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
-              name = 'CharterOrderList'
-            } else {
               name = 'CharterOrderListOP'
+            } else {
+              name = 'CharterOrderList'
             }
             this.$router.push({
               name: name,