no message

src/components/FinancialModule/TradeCommission/CommissionRule.vue

@@ -31,7 +31,7 @@
               <span>{{item.Name}}</span>
             </td>
             <td style="padding: 0 10px;" class="left-text-indent">
-              销售额{{item.SalesRate}}%
+              销售额 {{item.SalesRate}}%
             </td>
             <td style="padding: 0 10px;">
               <p>{{item.UpdateBy}}</p>

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -131,9 +131,9 @@
         </tr>
         <tr v-for="item in dataList">
           <td>{{item.OrderTypeName}}</td>
-          <td>{{item.BranchName}}</td>
-          <td>{{item.OutBranchName}}</td>
-          <td>{{item.DeptName}}</td>
+          <td>{{item.BranchName?item.BranchName:'-'}}</td>
+          <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
+          <td>{{item.DeptName?item.DeptName:'-'}}</td>
           <td>{{item.UserName}}</td>
           <td>{{item.LineName}}</td>
           <td>{{item.IsEurope==1?'是':'否'}}</td>
@@ -220,10 +220,13 @@
             ParentId:'-1',
             Tier:'0',
           },
+          S_CheckBranchOrder:false,
+          S_CheckAllOrder:false
         }
       },
       mounted() {
         let userInfo = this.getLocalStorage();
+        
         this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团ID
         this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
         this.departmentMsg.RB_Branch_Id = userInfo.RB_Branch_Id;
@@ -233,6 +236,13 @@
         this.GetOrderTypeEnumList()
         this.GetCommissionPeroidsList()//期数
         let ActionMenuCode = userInfo.ActionMenuCode;
+        // 判断是否销售
+        if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
+          this.S_CheckBranchOrder = true
+        }
+        if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
+          this.S_CheckAllOrder = true
+        }
         if (this.$route.query) { //不大于0的话用默认值
           if (this.$route.query.PeriodsId && this.$route.query.PeriodsId > 0) {
             this.msg.PeriodsId = Number(this.$route.query.PeriodsId)
@@ -267,13 +277,133 @@
                     }else{}
                 },err=>{})
             },	
-        clickUrl(item,type){
-            if(type==2){//线索
-                
+        clickUrl(row,type){
+          let data = [{
+          path: "",
+          OrderId: row.OrderId,
+          Type: ''
+        }]
+        let href
+        let url = this.domainManager().crmRoutingUrl;
+
+        if (row.OrderType == 1) {
+
+          if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
+            data[0].path = 'myCustomerOrderAllType'
+          } else {
+            data[0].path = 'customerOrderAllType'
+          }
+          href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
+          window.open(href);
+
+        } else {
+          let name = ''
+          if (row.OrderType == 6) {
+            if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
+              name = 'VisaProductEditOrder'
+            } else {
+              name = 'VisaProductEditOrderOP'
+            }
+            this.$router.push({
+              name: name,
+            });
+          } else if (row.OrderType == 2) { //跟团 一日游
+            if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
+              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 if (row.OrderType == 4) { //门票
+            if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
+              name = 'SingleticketOrderList'
+            } else {
+              name = 'SingleticketOrderListOP'
+            }
+          } else if (row.OrderType == 5) { //包车
+            if(row.CarType==''||row.CarType==null){
+              this.GetAdminCarOrderPageList(row,url,href,data)
             }else{
-                this.OrderStatistics(item)
+              if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){
+                data[0].path = 'CharterOrderList'
+              }else{
+                data[0].path = 'CharterOrderListOP'
+              }
+              data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
             }
+          } else if (row.OrderType == 7) { //jalan酒店
+            this.$message.info('jalan酒店暂不支持查看')
+            // if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){
+            //   name = 'CharterOrderList'
+            // }else{
+            //   name = 'CharterOrderListOP'
+            // }
+          }
+          if (name) {
+            this.$router.push({
+              name: name,
+              query: {
+                OrderId: row.OrderId,
+                blank: "y",
+              }
+            });
+          }
+
+        }
         },
+        GetAdminCarOrderPageList(row, url, href, data) {
+        let msg = {
+          pageIndex: 1,
+          pageSize: 5,
+          OrderType: '',
+          OrderId: row.OrderId,
+          OrderNo: '',
+          SurName: '',
+          Name: '',
+          OrderStatus: 0,
+          StartTime: '',
+          EndTime: '',
+          OrderSTime: '',
+          OrderETime: '',
+          ProductName: '',
+          Mobile: '', //电话
+          IsSelectSale: 1,
+          EnterID: 0, //业务员
+        }
+        let name
+        this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
+          if (res.data.resultCode == 1) {
+            let pageData = res.data.data.pageData
+            let OrderType
+            if (pageData && pageData.length > 0) {
+              OrderType = pageData[0].OrderType
+            }
+            if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
+              name = 'CharterOrderList'
+            } else {
+              name = 'CharterOrderListOP'
+            }
+            this.$router.push({
+              name: name,
+              query: {
+                OrderId: row.OrderId,
+                OrderType: OrderType ? OrderType : 4,
+                blank: "y",
+              }
+            });
+          }
+        })
+      },
+
         // 订单统计
         OrderStatistics(item){
           let data = [

src/components/myOrdersAllType/components/OrderList.vue

@@ -285,7 +285,16 @@
               name = 'SingleticketOrderListOP'
             }
           } else if (row.OrderType == 5) { //包车
-            this.GetAdminCarOrderPageList(row, url, href, data)
+            if(row.CarType==''||row.CarType==null){
+              this.GetAdminCarOrderPageList(row,url,href,data)
+            }else{
+              if(this.pagesTitle=='销售'){
+                data[0].path = 'CharterOrderList'
+              }else{
+                data[0].path = 'CharterOrderListOP'
+              }
+              data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
+            }
           } else if (row.OrderType == 7) { //jalan酒店
             this.$message.info('jalan酒店暂不支持查看')
             // if(this.pagesTitle=='销售'){