考级管理添加搜索

dist/static/css/chunk-e86491e4.c4bc273a.css → dist/static/css/chunk-207ca9e1.838dadba.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-4f5f3a0c],.el-button--primary[data-v-4f5f3a0c]:active,.el-button--primary[data-v-4f5f3a0c]:focus,.el-button--primary[data-v-4f5f3a0c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-4f5f3a0c] .el-image-viewer__close{color:#fff;opacity:1}[data-v-4f5f3a0c] .el-date-editor.el-input,[data-v-4f5f3a0c] .el-select{width:100%!important}[data-v-4f5f3a0c] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-759e3a84],.el-button--primary[data-v-759e3a84]:active,.el-button--primary[data-v-759e3a84]:focus,.el-button--primary[data-v-759e3a84]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-759e3a84] .el-image-viewer__close{color:#fff;opacity:1}[data-v-759e3a84] .el-date-editor.el-input,[data-v-759e3a84] .el-select{width:100%!important}[data-v-759e3a84] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

src/views/levelManager/levelManager.vue

@@ -9,6 +9,18 @@
             <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
                 <el-form-item>
                     <el-input
+                        v-model.trim="searchForm.orderNo"
+                        placeholder="请输入订单编号"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-input
+                        v-model.trim="searchForm.transNo"
+                        placeholder="请输入交易流水号"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-input
                         v-model.trim="searchForm.city"
                         @keyup.enter.native="city"
                         placeholder="请输入城市名"
@@ -118,6 +130,7 @@ import axios from "axios";
 // import store from '@/store'
 import { degreeQueryPage } from "./levelManageApi";
 import { getToken } from '@/utils/auth'
+import load from '@/utils/loading'
 export default {
   components: { pagination },
   name: "helpCategory",
@@ -125,6 +138,8 @@ export default {
     return {
         orderDate: null,
         searchForm: {
+            orderNo: null,
+            transNo: null,
             city: null,
             status: null,
             startTime: null,
@@ -153,6 +168,8 @@ export default {
     getList() {
         let searchForm = this.searchForm
         let params = {
+            orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+            transNo: searchForm.transNo ? searchForm.transNo : null,
             city: searchForm.city ? searchForm.city : null,
             status: searchForm.status ? searchForm.status : null,
             startTime: searchForm.startTime ? searchForm.startTime : null,
@@ -184,6 +201,8 @@ export default {
         let url = "/api-web/export/degreeRegistration";
         let searchForm = this.searchForm
         let params = {
+            orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+            transNo: searchForm.transNo ? searchForm.transNo : null,
             city: searchForm.city ? searchForm.city : null,
             status: searchForm.status ? searchForm.status : null,
             startTime: searchForm.startTime ? searchForm.startTime : null,
@@ -204,21 +223,35 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
         }).then(() => {
+            load.startLoading()
             axios(options).then(res => {
                 let blob = new Blob([res.data], {
-                // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
+                // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
                 type: "application/vnd.ms-excel;charset=utf-8"
-                // word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+                //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
                 });
-                let objectUrl = URL.createObjectURL(blob);
-                let link = document.createElement("a");
-                let nowTime = new Date();
-                let ymd = nowTime.getFullYear() + "" + (nowTime.getMonth() + 1) + "" + nowTime.getDate() + "" + nowTime.getHours() + "" + nowTime.getMinutes();
-                let fname = ymd + "考级报名列表";
-                link.href = objectUrl;
-                link.setAttribute("download", fname);
-                document.body.appendChild(link);
-                link.click();
+                let text = (new Response(blob)).text()
+                text.then(res => {
+                    // 判断是否报错
+                    if(res.indexOf('code') != -1) {
+                        let json = JSON.parse(res)
+                        this.$message.error(json.msg)
+                    } else {
+                        let objectUrl = URL.createObjectURL(blob);
+                        let link = document.createElement("a");
+                        let nowTime = new Date();
+                        let ymd = nowTime.getFullYear() + "" + (nowTime.getMonth() + 1) + "" + nowTime.getDate() + "" + nowTime.getHours() + "" + nowTime.getMinutes();
+                        let fname = ymd + "考级报名列表";
+                        link.href = objectUrl;
+                        link.setAttribute("download", fname);
+                        document.body.appendChild(link);
+                        link.click();
+                    }
+                })
+                load.endLoading();
+            }).catch(error => {
+                this.$message.error('导出数据失败，请联系管理员');
+                load.endLoading();
             });
         }).catch(() => {});
     },