1

src/components/FinancialModule/DataAnalysis/components/MemberRebate.vue

@@ -2,7 +2,7 @@
   <div style="margin-bottom: 20px; ">
     <div style="display: flex;align-items: center;">
       <h3 class="text-center" style="margin-bottom: 5px;">{{$t('objFill.v101.FinancialModule.gongstj')}}</h3>
-      <h5 class="text-center" style="margin-left:10px">注*: 幸福存折与积分均由出团公司返</h5>
+      <h5 class="text-center" style="margin-left:10px">注*: 幸福存折与积分均由报名公司返</h5>
     </div>
 
     <el-table
@@ -106,7 +106,7 @@
 
     <div style="display: flex;align-items: center;margin-top: 30px;">
       <h3 class="text-center" style="margin-bottom: 5px;">同行统计（仅展示Top50）</h3>
-      <h5 class="text-center" style="margin-left:10px">注*: 此处同行统计公司下所有的同行排名，包含联运返的部分。单公司查询时与上面公司统计返幸福存折金额因散拼联运会有不一致情况。</h5>
+      <h5 class="text-center" style="margin-left:10px">注*: 此处同行统计公司下所有的同行排名，如果同行同时归属于多个公司，则多公司均可查询此同行</h5>
     </div>
 
     <el-table
@@ -225,7 +225,7 @@ export default {
           name: "HappyPassbook",
           query: {
             CustomerId: customerId,
-            OutBranchId: OutBranchId,
+            RB_Branch_Id: OutBranchId,
             QStartDate: this.QStartDate,
             QEndDate: this.QEndDate,
             blank: "y",
@@ -238,7 +238,7 @@ export default {
           name: "IntegralQuery",
           query: {
             CustomerId: customerId,
-            OutBranchId: OutBranchId,
+            RB_Branch_Id: OutBranchId,
             QStartDate: this.QStartDate,
             QEndDate: this.QEndDate,
             blank: "y",

src/components/SalesModule/HappyPassbook.vue

@@ -225,9 +225,9 @@
           EndTime:"",
           LineId:"",
           EmployeeId:"",
-          RB_Branch_Id:"",
+          RB_Branch_Id:"-1",
           TCID:0,
-          OutBranchId:""
+          OutBranchId:"-1"
         },
         currentPage:1,
         DataList:[],
@@ -251,6 +251,9 @@
       if(this.$route.query.OutBranchId){
         this.msg.OutBranchId=this.$route.query.OutBranchId;
       }
+      if(this.$route.query.RB_Branch_Id){
+        this.msg.RB_Branch_Id=this.$route.query.RB_Branch_Id;
+      }
       if(this.$route.query.QStartDate && this.$route.query.QEndDate){
         this.dateList[0]=this.$route.query.QStartDate;
         this.dateList[1]=this.$route.query.QEndDate;

src/components/SalesModule/IntegralQuery.vue

@@ -200,9 +200,9 @@
           QStartDate:"",
           QEndDate:"",
           LineId:"",
-          RB_Branch_Id:"",
+          RB_Branch_Id:"-1",
           TCID:0,
-          OutBranchId:""
+          OutBranchId:"-1"
         },
         currentPage:1,
         DataList:[],
@@ -225,6 +225,9 @@
       if(this.$route.query.OutBranchId){
         this.msg.OutBranchId=this.$route.query.OutBranchId;
       }
+      if(this.$route.query.RB_Branch_Id){
+        this.msg.RB_Branch_Id=this.$route.query.RB_Branch_Id;
+      }
       if(this.$route.query.QStartDate && this.$route.query.QEndDate){
         this.dateList[0]=this.$route.query.QStartDate;
         this.dateList[1]=this.$route.query.QEndDate;