提交测试

1

src/views/main/baseinfo/management.vue

@@ -141,10 +141,10 @@ export default {
       let obj = {};
       let arr = [
         "APPLY_AMOUNT",
-        "PRACTICE_AMOUNT",
-        "OTHER_AMOUNT",
         "RENEW_AMOUNT",
         "VIP_AMOUNT",
+        "PRACTICE_AMOUNT",
+        "OTHER_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -315,7 +315,7 @@ export default {
         });
         for (const item of res.data) {
           // 再循环一遍
-          for (const key in this.items) {
+          for (const key in {...this.items,...this.items2}) {
             // console.log(key);
             if (item.dataType == key) {
               data[item.dataType] = {

src/views/main/constant.js

@@ -50,9 +50,15 @@ export const descs = {
   STUDENT_ERROR_LEAVE: '当月请假2次及以上',
   STUDENT_ARREARAGE: '缴费项目中的学员未缴费',
   NO_MEMBER_STUDENT_INFO:'进行中会员收费乐团中会员已过期在读学生数量',
-  MEMBER_STUDENT_INFO:"进行中会员收费乐团中会员有效期≤15天的在读学生数量"
+  MEMBER_STUDENT_INFO:"进行中会员收费乐团中会员有效期≤15天的在读学生数量" ,
+  APPLY_AMOUNT:"乐团报名缴费、新增学员缴费收入金额总和",
+   PRACTICE_AMOUNT:"网管课购买、续费金额总和",
+   OTHER_AMOUNT:"其他收入金额总和",
+   RENEW_AMOUNT:"乐团续费、临时加课、合班缴费金额总和",
+    VIP_AMOUNT:"VIP课购买、续费、复学、课程组新增学员收入金额总和",
 }
 
+
 const dates = {
   start: dayjs().subtract(2, 'month').set('date', 1).format('YYYY-MM-DD'),
   end: dayjs().format('YYYY-MM-DD'),