no message

src/components/FinancialModule/OPExtraReward/CommissionRule.vue

@@ -113,12 +113,12 @@
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.FExtraList"
                 :key="sIndex"
-              >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=当月毛利润<':'<=当月毛利润'}}</span>
+              >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=当月团数<':'<=当月团数'}}</span>
               <span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span>
               </th>
             </tr>
             <tr>
-              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.FExtraList" :key="sIndex">  {{ son.Rate }}%</td>
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.FExtraList" :key="sIndex">  {{ son.Rate }}</td>
             </tr>
           </template>
         </table>

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -389,7 +389,7 @@
             if(row.CarType==''||row.CarType==null){
               this.GetAdminCarOrderPageList(row,url,href,data)
             }else{
-              if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
+              if(this.S_CheckBranchOrder || this.S_CheckAllOrder){
                 name = 'CharterOrderListOP'
               }else{
                 name= 'CharterOrderList'

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -246,7 +246,7 @@
           },
           S_CheckBranchOrder:false,
           S_CheckAllOrder:false,
-          disabled:true
+          disabled:true,
         }
       },
       created(){
@@ -345,6 +345,7 @@
             // });
       },
         clickUrl(row,type){
+          console.log(row.OrderType,'----')
           let data = [{
           path: "",
           OrderId: row.OrderId,
@@ -401,7 +402,7 @@
             if(row.CarType==''||row.CarType==null){
               this.GetAdminCarOrderPageList(row,url,href,data)
             }else{
-              if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
+              if(this.S_CheckBranchOrder || this.S_CheckAllOrder){
                 name = 'CharterOrderListOP'
               }else{
                 name= 'CharterOrderList'
@@ -410,7 +411,7 @@
             }
           } else if (row.OrderType == 7) { //jalan酒店
             this.$message.info('jalan酒店暂不支持查看')
-            // if(!this.S_CheckBranchOrder  || !this.S_CheckAllOrder){
+            // if(!this.S_CheckBranchOrder  && !this.S_CheckAllOrder){
             //   name = 'CharterOrderList'
             // }else{
             //   name = 'CharterOrderListOP'

src/components/myOrdersAllType/components/OrderList.vue

@@ -248,7 +248,7 @@
 
         if (row.OrderType == 1) {
 
-          if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+          if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
             data[0].path = 'myCustomerOrderAllType'
           } else {
             data[0].path = 'customerOrderAllType'
@@ -259,7 +259,7 @@
         } else {
           let name = ''
           if (row.OrderType == 6) {
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'VisaProductEditOrder'
             } else {
               name = 'VisaProductEditOrderOP'
@@ -268,7 +268,7 @@
               name: name,
             });
           } else if (row.OrderType == 2) { //跟团 一日游
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               if (row.IsOneDayOrder == 1) {
                 name = 'groupTourOrderOne'
               } else {
@@ -278,13 +278,13 @@
               name = 'enrollTotal'
             }
           } else if (row.OrderType == 3) { //酒店
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'singleProductHotelOrder'
             } else {
               name = 'singleProductHotelOrderOP'
             }
           } else if (row.OrderType == 4) { //门票
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'SingleticketOrderList'
             } else {
               name = 'SingleticketOrderListOP'
@@ -347,7 +347,7 @@
             if (pageData && pageData.length > 0) {
               OrderType = pageData[0].OrderType
             }
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'CharterOrderList'
             } else {
               name = 'CharterOrderListOP'

src/components/rank/OrderList.vue

@@ -77,7 +77,7 @@
       </template>
     </el-table-column>
 
-    <!-- <el-table-column 
+    <!-- <el-table-column
             label="操作"
             show-overflow-tooltip>
             <template slot-scope="scope">
@@ -244,7 +244,7 @@
 
         if (row.OrderType == 1) {
 
-          if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+          if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
             data[0].path = 'myCustomerOrderAllType'
           } else {
             data[0].path = 'customerOrderAllType'
@@ -255,7 +255,7 @@
         } else {
           let name = ''
           if (row.OrderType == 6) {
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'VisaProductEditOrder'
             } else {
               name = 'VisaProductEditOrderOP'
@@ -264,7 +264,7 @@
               name: name,
             });
           } else if (row.OrderType == 2) { //跟团 一日游
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               if (row.TravelType == 1) {
                 name = 'groupTourOrder'
               } else {
@@ -274,13 +274,13 @@
               name = 'enrollTotal'
             }
           } else if (row.OrderType == 3) { //酒店
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'singleProductHotelOrder'
             } else {
               name = 'singleProductHotelOrderOP'
             }
           } else if (row.OrderType == 4) { //门票
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'SingleticketOrderList'
             } else {
               name = 'SingleticketOrderListOP'
@@ -343,7 +343,7 @@
             if (pageData && pageData.length > 0) {
               OrderType = pageData[0].OrderType
             }
-            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  || !this.S_CheckAllOrder)) {
+            if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder  && !this.S_CheckAllOrder)) {
               name = 'CharterOrderList'
             } else {
               name = 'CharterOrderListOP'