1修改报名统计不能查询 取消掉订单

2 财务单据新增了活动的id显示和跳转

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -787,6 +787,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
           <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==26"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
+          <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
           <template v-if="GetDetail.RelevanceFrId">
             <span class="fr" style="margin-right:10px;">
               相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -3426,6 +3428,8 @@
           tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID; 
         }else if(OtherType==26){
           tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;  
+        }else if(OtherType==40 || OtherType== 41){
+          tempStr = '/sale/activityList?Id='+ID; 
         }
           
           this.$router.push({

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -829,6 +829,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==26"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教师课时:{{GetDetail.ReFinanceId}}</span>
+            <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==40 || GetDetail.OtherType==41"
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育活动:{{GetDetail.ReFinanceId}}</span>
             <template v-if="GetDetail.RelevanceFrId">
               <span class="fr" style="margin-right:10px;">
                 相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -2167,6 +2169,8 @@
           tempStr = '/financial/userCommissionDetails?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;  
         }else if(OtherType==26){
           tempStr = '/course/rewardDetailed?TeacherIds='+this.GetDetail.EduCommissionEmp+'&Id='+ID;  
+        }else if(OtherType==40 || OtherType== 41){
+          tempStr = '/sale/activityList?Id='+ID; 
         }
           
           this.$router.push({

src/pages/sale/activityList.vue

@@ -286,7 +286,8 @@ import ActiveOrderForm from '../../components/sale/activeOrder-form.vue'
           SelectStartTimeStr:"",
           SelectEndTimeStr:"",
           SelectIsEnd:-1,
-          rowsPerPage:10
+          rowsPerPage:10,
+          Id:0,
         },
         pageCount: 0,
         activityTypeList:[],
@@ -375,6 +376,9 @@ import ActiveOrderForm from '../../components/sale/activeOrder-form.vue'
     },
 
     mounted() {
+      if(this.$route.query && this.$route.query.Id){
+        this.msg.Id = this.$route.query.Id
+      }
       this.getList();
       this.getActiveTypeList();
     },

src/pages/sale/orderStatistics.vue

@@ -37,7 +37,7 @@
             option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
+          <q-select @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name" 
             v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" />
         </div>
         <div class="col-3">