lex 2 年之前
父节点
当前提交
c240f7c060
共有 2 个文件被更改,包括 105 次插入95 次删除
  1. 5 1
      src/views/levelManager/gradeManager.vue
  2. 100 94
      src/views/levelManager/levelManager.vue

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

@@ -127,7 +127,11 @@
                 @click="
                   () => {
                     $router.push({
-                      path: '/levelManager'
+                      path: '/levelManager',
+                      query: {
+                        id: scope.row.id,
+                        title: scope.row.name
+                      }
                     });
                   }
                 "

+ 100 - 94
src/views/levelManager/levelManager.vue

@@ -3,7 +3,10 @@
     <h2>
       <!-- <div class="squrt"></div>
       考级报名 -->
-      <el-page-header @back="onCancel" :content="'考级报名'"></el-page-header>
+      <el-page-header
+        @back="onCancel"
+        :content="title || '考级报名'"
+      ></el-page-header>
     </h2>
     <div class="m-core">
       <el-card header="" style="width:55%" class="myCard">
@@ -76,8 +79,8 @@
             clearable
             placeholder="请选择缴费状态"
           >
-            <el-option :value="1" label="未缴费"></el-option>
-            <el-option :value="2" label="已缴费"></el-option>
+            <el-option :value="0" label="未支付"></el-option>
+            <el-option :value="2" label="已支付"></el-option>
             <el-option :value="3" label="已退费"></el-option>
           </el-select>
         </el-form-item>
@@ -116,12 +119,52 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-          <!-- <el-table-column width="90px" align="center" prop="id" label="编号">
-            <template slot-scope="scope">
-              <copy-text>{{ scope.row.id }}</copy-text>
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" inline class="demo-table-expand">
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="联系电话">
+                      <span>{{ props.row.mobile }}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="证件号码">
+                      <span>{{ props.row.idcard }}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="证件号码">
+                      <span>{{ props.row.idcard }}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="性别">
+                      <span>{{ props.row.gender == 1 ? "男" : "女" }}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="交易流水号">
+                      <span
+                        ><copy-text>{{ props.row.transNo }}</copy-text></span
+                      >
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="学校">
+                      <span>{{ props.row.school }}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="备注">
+                      <span>{{ props.row.memo }}</span>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
             </template>
-          </el-table-column> -->
-          <el-table-column prop="name" label="姓名" min-width="120px" fixed>
+          </el-table-column>
+          <el-table-column prop="name" label="姓名" min-width="100px">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.name }}</copy-text>
               <br />
@@ -134,92 +177,35 @@
               <copy-text>{{ scope.row.orderNo }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="transNo"
-            label="交易流水号"
-            min-width="110px"
-          >
-            <template slot-scope="scope">
-              <el-tooltip placement="top-start">
-                <div slot="content">{{ scope.row.transNo }}</div>
-              </el-tooltip>
-              <copy-text>{{ scope.row.transNo }}</copy-text>
-            </template>
-          </el-table-column>
           <el-table-column align="center" prop="city" label="所属城市">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.city }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="school" label="学校">
-            <template slot-scope="scope">
-              <copy-text>{{ scope.row.school }}</copy-text>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="gender" label="性别">
-            <template slot-scope="scope">{{
-              scope.row.gender == 1 ? "男" : "女"
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="idcard"
-            label="证件号码"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="mobile"
-            label="联系电话"
-            width="120px"
-          ></el-table-column>
           <el-table-column align="center" prop="subject" label="报考专业">
             <template slot-scope="scope">
-              {{ scope.row.type == 1 ? scope.row.subject : "乐理" }}
+              {{ scope.row.type === "GRADE" ? "专业考级" : "乐理考级" }}
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="level"
-            label="报考级别"
-            width="150px"
-          >
+          <el-table-column align="center" prop="level" label="报考信息">
             <template slot-scope="scope">
-              <div v-if="scope.row.level">
-                {{ scope.row.level }} / {{ scope.row.money | moneyFormat }}元
+              <div>
+                {{
+                  scope.row.type === "GRADE"
+                    ? scope.row.subjectName
+                      ? scope.row.subjectName + "/"
+                      : ""
+                    : ""
+                }}
+                <span v-if="scope.row.level"
+                  >{{ scope.row.level }}/{{
+                    scope.row.money | moneyFormat
+                  }}元</span
+                >
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column
-            align="center"
-            prop="subject"
-            label="报考乐器"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="level"
-            label="报考级别"
-            width="150px"
-          >
-            <template slot-scope="scope">
-              <div v-if="scope.row.level">
-                {{ scope.row.level }} / {{ scope.row.money | moneyFormat }}元
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="theoryLevel"
-            width="150px"
-            label="乐理级别"
-          >
-            <template slot-scope="scope">
-              <div v-if="scope.row.theoryLevel">
-                {{ scope.row.theoryLevel }} /
-                {{ scope.row.theoryMoney | moneyFormat }}元
-              </div>
-            </template>
-          </el-table-column> -->
+
           <el-table-column align="center" label="缴费状态">
             <template slot-scope="scope">{{
               scope.row.status | statusFilter
@@ -242,17 +228,9 @@
             align="center"
             prop="createTime"
             label="报名时间"
-            min-width="168px"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="memo"
-            label="备注"
           ></el-table-column>
           <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
-              <!-- @click="onTypeDelOpeation(scope.row)"
-                v-permission="'helpCenterContent/delete'" -->
               <el-button
                 v-if="
                   scope.row.status == 2 && $helpers.permission('degree/refund')
@@ -281,7 +259,11 @@ import pagination from "@/components/Pagination/index";
 import axios from "axios";
 import cleandeep from "clean-deep";
 // import store from '@/store'
-import { degreeQueryPage, degreeRefund } from "./levelManageApi";
+import {
+  degreeQueryPage,
+  degreeRefund,
+  degreeStatistic
+} from "./levelManageApi";
 import { getToken, getTenantId } from "@/utils/auth";
 import { getTimes } from "@/utils";
 import load from "@/utils/loading";
@@ -290,18 +272,18 @@ export default {
   components: { pagination, "count-to": countTo },
   name: "helpCategory",
   data() {
+    const query = this.$route.query;
     return {
+      id: query.id,
+      title: query.title,
       searchForm: {
         name: null,
-        orderNo: null,
-        transNo: null,
         city: null,
         status: 2,
         startTime: null,
         organId: null,
         endTime: null,
-        orderDate: [],
-        degreeType: 4
+        orderDate: []
       },
       totalNumber: 0,
       totalAmount: 0,
@@ -318,9 +300,16 @@ export default {
   },
   mounted() {
     this.$store.dispatch("setBranchs");
+    this.getDetails();
     this.getList();
   },
   methods: {
+    async getDetails() {
+      try {
+        const { data } = await degreeStatistic({ id: this.id });
+        console.log(data);
+      } catch {}
+    },
     onSearch() {
       this.pageInfo.page = 1;
       this.getList();
@@ -494,4 +483,21 @@ export default {
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
 }
+
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-right: 10px;
+  position: relative;
+}
+::v-deep .demo-table-expand label {
+  color: #99a9bf;
+  z-index: 100;
+}
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 20px 0 20px 60px;
+}
 </style>