1 甲鹤简易报表调整

src/api/finance/index.js

@@ -186,6 +186,15 @@ export function getStudentConsumptionHoursDetialPageList(data) {
   });
 }
 
+// 财务报表 学生课耗明细列表
+export function GetStudentConsumptionHoursDetialStat(data) {
+  return request({
+    url: '/finance/GetStudentConsumptionHoursDetialStat',
+    method: 'post',
+    data
+  });
+}
+
 // 财务报表 销售业绩排名统计
 export function getSaleAchievementsRankStatistics(data) {
   return request({

src/pages/course/classHourReward.vue

@@ -582,8 +582,11 @@ export default {
     this.financeinfo_post_GetList();
     let nowdate = new Date();
     let upperMonth = new Date(nowdate.setMonth(nowdate.getMonth() - 1)); //小于本月
-    this.addMsg.Month =
-      upperMonth.getFullYear() + "-" + (upperMonth.getMonth() + 1);
+    this.addMsg.Month = upperMonth.getFullYear() + "-" + (upperMonth.getMonth() + 1);
+
+    if (this.$route.query && this.$route.query.Month) {
+      this.msg.Month = this.$route.query.Month
+    }
   },
   methods: {
     financeinfo_post_GetList() {

src/pages/financial/EasyReport.vue

@@ -891,18 +891,39 @@
           endDate = that.year + "-" + column.end
         }
         if (rowIndex < 7 ) {
-          // 联运收入
-          // if(rowData.ZhaiYao=="联运收入"){
-          //   that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
-          // }
-          // // 跳转到应收团款查询
-          // else if(rowData.ZhaiYao=="营业总收入"){
-          //   that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询")
-          // }
-          // else if(rowData.ZhaiYao=="营业总成本"){
-          //   that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
-          // }
-          if(column.title!='合计' && column.title!="摘要"){
+          if(rowData.ZhaiYao == "营业收入"){
+            ///financial/studentsClassfee?datetype=2&valueyear=2023&StartMonth=2023-8&EndMonth=2023-8
+            this.OpenNewUrl('/financial/studentsClassfee', {
+              datetype:2,
+              valueyear:that.year,
+              StartMonth:that.year + "-" +month,
+              EndMonth:that.year + "-" +month,
+                SchoolId:this.msg.BranchId
+            });
+          }
+          else if(rowData.ZhaiYao == "其他收入"){
+            that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, 1159)
+          }
+          else if(rowData.ZhaiYao == "课时费"){
+            let newMonth = new Date(startDate);
+            let upperMonth2 = new Date(newMonth.setMonth(newMonth.getMonth() -1)); //小于本月
+            let month2 = upperMonth2.getFullYear() + "-" + (upperMonth2.getMonth()+1);
+            this.OpenNewUrl('/course/classHourReward', {
+              Month:month2
+            });
+          }
+          else if(rowData.ZhaiYao == "返佣"){
+            this.OpenNewUrl('/financial/returnPassbook/ReturnperiodsList', {
+              Month:that.year + "-" +month
+            });
+          }
+          else if(rowData.ZhaiYao == "销售提成"){
+            this.OpenNewUrl('/financial/market/achievementPeriodsList', {});
+          }
+          else if(rowData.ZhaiYao == "人头奖励"){
+            this.OpenNewUrl('/financial/market/empBonus', {});
+          }
+          else if(column.title!='合计' && column.title!="摘要"){
             this.OpenNewUrl('/financial/reportform/RecPayQueryTeam', {
               StartTime: startDate,
                 EndTime: endDate,

src/pages/financial/returnPassbook/ReturnperiodsList.vue

@@ -191,6 +191,9 @@
       })
       var myDate = new Date();
       myDate.setMonth(myDate.getMonth() - 1);
+      if (this.$route.query && this.$route.query.Month) {
+      this.msg.Month = this.$route.query.Month
+    }
     },
     mounted() {
       this.getList(); //获取提成周期列表

src/pages/financial/studentsClassfee.vue

@@ -233,7 +233,8 @@
       class="page-search row items-center"
       style="justify-content: space-between"
     >
-      <span style="font-size: 20px; font-weight: 400">学生课耗明细列表</span>
+      <span style="font-size: 20px; font-weight: 400"><span>累计课时：{{statData.TClassHours}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+      <span>课耗金额：{{statData.TXHMoney}}</span></span>
       <q-btn
         color="primary"
         size="11px"
@@ -242,6 +243,10 @@
         style="margin-left: 10px"
       />
     </div>
+  <!-- <div style="font-size:20px">
+      <span>累计课时：{{statData.TClassHours}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+      <span>课耗金额：{{statData.TXHMoney}}</span>
+  </div> -->
     <template>
       <el-table
         ref="filterTable"
@@ -431,6 +436,7 @@ import {
   getClassDropDownList,
 } from "../../api/school/index";
 import { getStudentConsumptionHoursDetialPageList } from "../../api/finance/index";
+import { GetStudentConsumptionHoursDetialStat } from "../../api/finance/index";
 import { EduDownLoad } from "../../api/common/common";
 export default {
   meta: {
@@ -460,6 +466,7 @@ export default {
       pageCount: 0,
       listData: {},
       tableData: [],
+      statData: [],
       total: 0,
       CompanyList: [],
 
@@ -487,7 +494,9 @@ export default {
     if (this.$route.query && this.$route.query.valueyear) {
       this.valueyear = this.$route.query.valueyear;
     }
-
+    if (this.$route.query && this.$route.query.SchoolId) {
+      this.msg.SchoolId = this.$route.query.SchoolId;
+    }
     if (this.$route.query && this.$route.query.StartMonth) {
       this.msg.StartMonth = this.$route.query.StartMonth;
     }
@@ -533,6 +542,12 @@ export default {
           this.total = res.Data.Count;
         }
       });
+      GetStudentConsumptionHoursDetialStat(this.msg).then((res)=>{
+          if(res.Code == 1){
+            this.statData = res.Data;
+          }
+        }
+      );
     },
     //获取教师下拉
     GetTeacherList() {