lex 2 years ago
parent
commit
b98fd63104

+ 7 - 0
src/views/levelManager/levelManageApi.js

@@ -184,3 +184,10 @@ export const degreeUpdate = data =>
     data,
     method: "post"
   });
+// 考级信息统计
+export const degreeStatistic = data =>
+  request2({
+    url: "/api-web/degree/statistic",
+    params: data,
+    method: "get"
+  });

+ 7 - 71
src/views/levelManager/levelManager.vue

@@ -6,7 +6,7 @@
       <el-page-header @back="onCancel" :content="'考级报名'"></el-page-header>
     </h2>
     <div class="m-core">
-      <el-card header="" style="width:60%" class="myCard">
+      <el-card header="" style="width:55%" class="myCard">
         <statistic class="statistic" :cols="0">
           <statistic-item>
             <span>
@@ -26,12 +26,6 @@
             </span>
             <span> <count-to :endVal="100"/></span>
           </statistic-item>
-          <statistic-item>
-            <span>
-              课程收入
-            </span>
-            <span> <count-to :endVal="100"/></span>
-          </statistic-item>
         </statistic>
       </el-card>
 
@@ -48,21 +42,7 @@
           <el-input
             v-model.trim="searchForm.name"
             clearable
-            placeholder="请输入姓名"
-            @keyup.enter.native="
-              e => {
-                e.target.blur();
-                $refs.searchForm.save();
-                search();
-              }
-            "
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="orderNo">
-          <el-input
-            v-model.trim="searchForm.orderNo"
-            clearable
-            placeholder="请输入订单编号"
+            placeholder="姓名/编号/手机号"
             @keyup.enter.native="
               e => {
                 e.target.blur();
@@ -72,39 +52,9 @@
             "
           ></el-input>
         </el-form-item>
-        <el-form-item prop="transNo">
-          <el-input
-            v-model.trim="searchForm.transNo"
-            @keyup.enter.native="
-              e => {
-                e.target.blur();
-                $refs.searchForm.save();
-                search();
-              }
-            "
-            clearable
-            placeholder="请输入交易流水号"
-          ></el-input>
-        </el-form-item>
-        <!-- <el-form-item>
-          <el-input v-model.trim="searchForm.city"
-                    @keyup.enter.native="city"
-                    placeholder="请输入城市名"></el-input>
-        </el-form-item> -->
-        <el-form-item prop="city">
-          <el-input
-            v-model.trim="searchForm.city"
-            @keyup.enter.native="
-              e => {
-                e.target.blur();
-                $refs.searchForm.save();
-                search();
-              }
-            "
-            clearable
-            placeholder="请输入所属城市"
-          ></el-input>
-          <!-- <el-select
+
+        <el-form-item prop="organId">
+          <el-select
             v-model.trim="searchForm.organId"
             filterable
             clearable
@@ -116,20 +66,6 @@
               :label="item.name"
               :value="item.id"
             ></el-option>
-          </el-select> -->
-        </el-form-item>
-        <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.degreeType"
-            filterable
-            clearable
-            placeholder="请选择考级类型"
-          >
-            <el-option :value="4" label="2023级寒假考级"></el-option>
-            <el-option :value="3" label="2022级暑假考级"></el-option>
-            <el-option :value="2" label="2022级寒假考级"></el-option>
-            <el-option :value="1" label="2021级寒假考级"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -170,11 +106,11 @@
           >
         </el-form-item>
       </save-form>
-      <div style="font-size: 14px; color: #f85043; padding-bottom: 10px">
+      <!-- <div style="font-size: 14px; color: #f85043; padding-bottom: 10px">
         报考总人数:{{ totalNumber }}人
         <i style="width: 10px; display: inline-block"></i>
         实收总金额:{{ totalAmount }}元
-      </div>
+      </div> -->
       <div class="tableWrap">
         <el-table
           :data="tableList"

+ 3 - 0
src/views/levelManager/levelSetting.vue

@@ -105,6 +105,9 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="fee" label="报名金额">
+            <template slot-scope="scope">
+              {{ scope.row.fee | moneyFormat }}
+            </template>
           </el-table-column>
           <el-table-column align="center" prop="credentials" label="上传证书">
             <template slot-scope="scope">

+ 3 - 4
src/views/levelManager/model/grade-operation.vue

@@ -130,7 +130,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          return dayjs(timer).valueOf() >= dayjs(time).valueOf();
+          return dayjs(timer).valueOf() > dayjs(time).valueOf();
         }
       };
     },
@@ -155,13 +155,12 @@ export default {
     },
     onSubmit() {
       this.$refs.elForm.validate(async res => {
-        console.log(res, this.forms, "res");
         if (!res) return;
-
         const forms = this.forms;
         const params = {
           ...forms,
-          organIds: forms.organIds ? forms.organIds.join(",") : ""
+          organIds: forms.organIds ? forms.organIds.join(",") : "",
+          endTime: forms.endTime + " 23:59:59"
         };
 
         try {