Browse Source

修改功能

lex 2 years ago
parent
commit
1f0046412e

+ 2 - 2
src/views/levelManager/components/level-notice.vue

@@ -24,7 +24,7 @@
           "
         ></el-input>
       </el-form-item>
-      <el-form-item>
+      <el-form-item prop="status">
         <el-select
           class="multiple"
           v-model.trim="searchForm.status"
@@ -145,7 +145,7 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
-      this.search();
+      this.onSearch();
     },
     async getList() {
       try {

+ 2 - 2
src/views/levelManager/components/level-regulations.vue

@@ -24,7 +24,7 @@
           "
         ></el-input>
       </el-form-item>
-      <el-form-item>
+      <el-form-item prop="status">
         <el-select
           class="multiple"
           v-model.trim="searchForm.status"
@@ -145,7 +145,7 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
-      this.search();
+      this.onSearch();
     },
     async getList() {
       try {

+ 2 - 2
src/views/levelManager/components/student-rule.vue

@@ -39,7 +39,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item prop="status">
         <el-select
           class="multiple"
           v-model.trim="searchForm.status"
@@ -163,7 +163,7 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
-      this.search();
+      this.onSearch();
     },
     async getList() {
       try {

+ 1 - 2
src/views/levelManager/gradeManager.vue

@@ -42,7 +42,7 @@
             }"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="status">
           <el-select
             class="multiple"
             v-model.trim="searchForm.status"
@@ -207,7 +207,6 @@ export default {
       // 重置搜索
       this.orderDate = null;
       this.$refs.searchForm.resetFields();
-      this.searchForm.status = 2;
       this.onSearch();
     },
     async getList() {

+ 47 - 8
src/views/levelManager/levelManager.vue

@@ -15,19 +15,19 @@
             <span>
               报名人数
             </span>
-            <span> <count-to :endVal="1001"/></span>
+            <span> <count-to :endVal="registerNum"/></span>
           </statistic-item>
           <statistic-item>
             <span>
               报名人次
             </span>
-            <span> <count-to :endVal="100"/></span>
+            <span> <count-to :endVal="registerTotal"/></span>
           </statistic-item>
           <statistic-item>
             <span>
               考级收入
             </span>
-            <span> <count-to :endVal="100"/></span>
+            <span> <count-to :endVal="degreeIncome" :decimals="2"/></span>
           </statistic-item>
         </statistic>
       </el-card>
@@ -71,7 +71,35 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="degreeType">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.degreeType"
+            filterable
+            clearable
+            placeholder="报考项目"
+          >
+            <el-option value="GRADE" label="专业考级"></el-option>
+            <el-option value="THEORY" label="乐理考级"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="level">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.level"
+            filterable
+            clearable
+            placeholder="级别"
+          >
+            <el-option
+              v-for="item in degreeLevel"
+              :key="item.value"
+              :value="item.value"
+              :label="item.text"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="status">
           <el-select
             class="multiple"
             v-model.trim="searchForm.status"
@@ -164,7 +192,7 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="姓名" min-width="100px">
+          <el-table-column prop="name" label="姓名" min-width="80px">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.name }}</copy-text>
               <br />
@@ -198,7 +226,7 @@
                     : ""
                 }}
                 <span v-if="scope.row.level"
-                  >{{ scope.row.level }}/{{
+                  >{{ degreeLevelCn[scope.row.level] }}/{{
                     scope.row.money | moneyFormat
                   }}元</span
                 >
@@ -262,7 +290,9 @@ import cleandeep from "clean-deep";
 import {
   degreeQueryPage,
   degreeRefund,
-  degreeStatistic
+  degreeStatistic,
+  degreeLevelCn,
+  degreeLevel
 } from "./levelManageApi";
 import { getToken, getTenantId } from "@/utils/auth";
 import { getTimes } from "@/utils";
@@ -274,12 +304,16 @@ export default {
   data() {
     const query = this.$route.query;
     return {
+      degreeLevelCn,
+      degreeLevel,
       id: query.id,
       title: query.title,
       searchForm: {
         name: null,
         city: null,
         status: 2,
+        degreeType: null,
+        level: null,
         startTime: null,
         organId: null,
         endTime: null,
@@ -287,6 +321,9 @@ export default {
       },
       totalNumber: 0,
       totalAmount: 0,
+      registerTotal: 0, // 报名人次
+      registerNum: 0, // 报名人次
+      degreeIncome: 0, // 考级收入
       tableList: [],
       pageInfo: {
         // 分页规则
@@ -308,6 +345,9 @@ export default {
       try {
         const { data } = await degreeStatistic({ id: this.id });
         console.log(data);
+        this.registerTotal = data.registerTotal || 0;
+        this.degreeIncome = data.degreeIncome || 0;
+        this.registerNum = data.registerNum || 0;
       } catch {}
     },
     onSearch() {
@@ -316,7 +356,6 @@ export default {
     },
     onReSet() {
       // 重置搜索
-
       this.orderDate = null;
       this.$refs.searchForm.resetFields();
       //  this.$set(this.searchForm,'status','pay')

+ 4 - 4
src/views/levelManager/levelSetting.vue

@@ -14,7 +14,7 @@
         @reset="onReSet"
         :model="searchForm"
       >
-        <el-form-item>
+        <el-form-item prop="subjects">
           <el-select
             v-model.trim="searchForm.subjectId"
             filterable
@@ -29,7 +29,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="degreeType">
           <el-select
             class="multiple"
             v-model.trim="searchForm.degreeType"
@@ -41,7 +41,7 @@
             <el-option value="THEORY" label="乐理考级"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="level">
           <el-select
             class="multiple"
             v-model.trim="searchForm.level"
@@ -57,7 +57,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="credentials">
           <el-select
             class="multiple"
             v-model.trim="searchForm.credentials"