no message

src/components/SalesModule/enrollTotal.vue

@@ -822,6 +822,7 @@
           IsUseCoupon: "0",
           IsUseRedEnvelopeMoney: "0",
           CustomerId:"0",
+          isNormal:0,
         },
         employeeMsg: {
           RB_Group_id: "0",
@@ -938,6 +939,10 @@
             this.msg.CEndDate = this.$route.query.CEndDate
             if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
           }
+          if(this.$route.query.BranchId>=-1){
+            this.msg.BranchId = this.$route.query.BranchId
+          } 
+          if(this.$route.query.isNormal) this.msg.isNormal =this.$route.query.isNormal 
           if(this.$route.query.CustomerName){
             this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
             if(this.$route.query.CustomerId){
@@ -1320,6 +1325,10 @@
           this.msg.CEndDate = this.$route.query.CEndDate
           if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
         }
+        if(this.$route.query.BranchId>=-1){
+            this.msg.BranchId = this.$route.query.BranchId
+          } 
+          if(this.$route.query.isNormal) this.msg.isNormal =this.$route.query.isNormal 
       if(this.$route.query.CustomerName){
         this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
         if(this.$route.query.CustomerId){

src/components/rank/dataCount.vue

@@ -883,18 +883,22 @@ export default {
           query = {
             CStartDate: this.parameters.dateRange[0],
             CEndDate: this.parameters.dateRange[1],
+            BranchId: this.parameters.branchId,
+            isNormal: 1,
             blank: "y",
           }
         }else if(type==6){
           query = {
             CStartDate: this.parameters.dateRange[0],
             CEndDate: this.parameters.dateRange[1],
+            isNormal: 1,
             blank: "y",
           }
         }else if(type==7){
           query = {
             CStartDate: this.parameters.dateRange[0],
             CEndDate: this.parameters.dateRange[1],
+            isNormal: 1,
             blank: "y",
             
           }
@@ -903,6 +907,7 @@ export default {
             CStartDate: this.parameters.dateRange[0],
             CEndDate: this.parameters.dateRange[1],
             discount: 1,
+            isNormal: 1,
             blank: "y",
           }
         }