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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1786,7 +1786,8 @@
             name: 'TradeTicketDetails',
             query: {
               PeriodId: GetDetail.ReFinanceId,
-              OutBranchId: GetDetail.RB_Branch_Id,
+              // OutBranchId: GetDetail.RB_Branch_Id,
+              RB_Branch_Id: GetDetail.RB_Branch_Id,
               blank: "y",
               tab: "同业提成详情"
             }

src/components/myOrdersAllType/components/allList.vue

@@ -609,6 +609,15 @@
           this.msg.StartTime = this.getBeforeDate(0, new Date())
           this.msg.EndTime = this.getBeforeDate(0, new Date())
           this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
+          if(this.$route.query.Q_IsCollect){
+            this.msg.Q_IsCollect=this.$route.query.Q_IsCollect
+            this.msg.DepartSTime=this.$route.query.DepartSTime
+            this.msg.DepartETime=this.$route.query.DepartETime
+            this.msg.StartTime = ''
+            this.msg.EndTime = ''
+            this.DatelistBM = []
+            this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
+          }
           // this.GetOrderStatusEnumList()//订单状态
           // this.GetTicketStatusEnumList()//出票状态
           this.GetOrderTypeEnumList()

src/components/sale/ExpectedCommission.vue

@@ -523,7 +523,10 @@
         this.$router.push({
           name: 'erpMyCustomerOrder',
           query: {
-            blank: 'y'
+            blank: 'y',
+            Q_IsCollect: "2",
+            DepartSTime: this.commissionMsg.DepartSTime,
+            DepartETime: this.commissionMsg.DepartETime
           }
         });
       },
@@ -556,6 +559,7 @@
       },
       // 获取预期数据
       getData(){
+        // 日本欧洲提成
         this.apipost('sellcommission_GetTYSaleExpectCommission', this.msg,
           res => {
             if (res.data.resultCode == 1) {
@@ -591,6 +595,7 @@
           },
           err => {this.loading = false}
         );
+        // 国内提成
         this.apipost('sellcommission_Post_GetGNSaleExpectCommission', this.msg,
           res => {
             if (res.data.resultCode == 1) {
@@ -613,7 +618,7 @@
             if (res.data.resultCode == 1) {
               let data = res.data.data.pageData
               if(data.length>5){
-                for(let i=0;i<6;i++){
+                for(let i=0;i<5;i++){
                   this.OrderList.push(data[i])
                 }
               }else{