1

1

dist/static/css/chunk-9dec6de0.6ae5ecbc.css → dist/static/css/chunk-5d0da7dc.e21876a4.css

@@ -1 +1 @@
-[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-14d3870f]{line-height:44px}.fixedBox[data-v-14d3870f]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-14d3870f]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-14d3870f]{font-size:18px;cursor:pointer}[data-v-14d3870f] .el-divider--horizontal{margin:0!important}.topWrap[data-v-14d3870f]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-14d3870f]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

dist/static/css/chunk-301cfd2c.166f4fd5.css → dist/static/css/chunk-71b38ba0.bb27d388.css

@@ -1 +1 @@
-.newBand[data-v-d4045b8a]{display:inline-block}[data-v-d4045b8a] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-d4045b8a]{display:inline-block}.lookTitle[data-v-d4045b8a]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-d4045b8a]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-d4045b8a]{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:start;-ms-flex-pack:start;justify-content:flex-start}
+.newBand[data-v-6fcf95dc]{display:inline-block}[data-v-6fcf95dc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-6fcf95dc]{display:inline-block}.lookTitle[data-v-6fcf95dc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-6fcf95dc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-6fcf95dc]{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:start;-ms-flex-pack:start;justify-content:flex-start}

src/constant/index.js

@@ -260,3 +260,7 @@ export const clientType = {
 // export const musicScoreCategoriesId = [
 //   ''
 // ]
+export const downListType = {
+  1:'订单列表',
+  2:'财务管理'
+}

src/router/index.js

@@ -432,7 +432,9 @@ export const asyncRoutes = {
   teamPayInfo:()=>import('@/views/courseListManager'),
   serverDetail:()=>import('@/views/serverDetail'),
   // 未在班级学员
-  notClassStudent:()=>import('@/views/main/notClassStudent')
+  notClassStudent:()=>import('@/views/main/notClassStudent'),
+  // 报表中心 下载列表
+  downList:()=>import('@/views/reportForm/downList')
 }
 
 export default router

src/router/notKeepAliveList.js

@@ -102,6 +102,7 @@ export default [
   '/business/ArrearageStudents',
   '/operateManager/serverDetail', // 服务指标明细
   '/business/remedy', //
-  '/setSilder/setSilder'
+  '/setSilder/setSilder',
+  '/downList', //下载列表
   // '/business/feeAudit',
 ]

src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,musicGroupType } from '../constant'
+import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "声部课", value: "SINGLE" },
@@ -225,6 +225,8 @@ export const orderAuditTypeList = getValueForKey(orderAuditType)
 export const rewardModeTypeList = getValueForKey(rewardModeType)
 export const musicClassTypeList =  getValueForKey(musicClassType)
 export const ProbationPeriodList = getValueForKey(ProbationPeriodStatus)
+export const downTypeList = getValueForKey(downListType)
+//downListType
 function getValueForKey (obj) {
   let arr = []
   for (let k in obj) {

src/utils/vueFilter.js

@@ -735,3 +735,9 @@ Vue.filter('gradeTypeFormat', value => {
 Vue.filter('ProbationPeriod', value => {
   return constant.ProbationPeriodStatus[value]
 })
+
+// 下载列表 类型
+// downListType
+Vue.filter('downListType', value => {
+  return constant.downListType[value]
+})

src/views/businessManager/orderManager/financeManager.vue

@@ -883,7 +883,7 @@ export default {
         },
         data: qs.stringify(cleanDeep(data)),
         url,
-        responseType: "blob",
+        responseType: "json",
       };
       this.$confirm("您确定导出报表", "提示", {
         confirmButtonText: "确定",
@@ -893,30 +893,36 @@ export default {
         .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.ms-excel;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 = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
-            link.href = objectUrl;
-            link.setAttribute("download", fname);
-            document.body.appendChild(link);
-            link.click();
             load.endLoading();
+            if(res.data.code == 200) {
+              this.$message.info(res.data.data);
+            } else {
+              this.$message.error(res.data.msg);
+            }
+            // let blob = new Blob([res.data], {
+            //   // 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
+            // });
+            // 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 = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
+            // link.href = objectUrl;
+            // link.setAttribute("download", fname);
+            // document.body.appendChild(link);
+            // link.click();
+            // load.endLoading();
           });
         })
         .catch(() => {});

src/views/businessManager/orderManager/income.vue

@@ -439,7 +439,7 @@ export default {
         },
         data: qs.stringify(cleanDeep(data)),
         url,
-        responseType: "blob",
+        responseType: "json",
       };
       this.$confirm("您确定导出报表", "提示", {
         confirmButtonText: "确定",
@@ -450,40 +450,21 @@ export default {
           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.ms-excel;charset=utf-8",
-                //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-              });
-              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 = "报表导出" + new Date().getTime()+'.xls'; //下载文件的名字
-                  link.href = objectUrl;
-                  link.setAttribute("download", fname);
-                  document.body.appendChild(link);
-                  link.click();
-                }
-              });
-
               load.endLoading();
+              if(res.data.code == 200) {
+                this.$message.info(res.data.data);
+              } else {
+                this.$message.error(res.data.msg);
+              }
+              // this.$confirm(res.data.data, "提示", {
+              //   confirmButtonText: "确定",
+              //   cancelButtonText: "取消",
+              //   type: "warning",
+              // }).then(() => {
+
+              // }).catch(err => {
+
+              // })
             })
             .catch((error) => {
               this.$message.error("导出数据失败，请联系管理员");

src/views/reportForm/api.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+import request2 from '@/utils/request2'
+import qs from 'qs'
+let api = '/api-web'
+
+
+export function managerDownloadList(data) {
+  return request2({
+    url: api + '/managerDownload/queryPage',
+    method: 'get',
+    params: data
+  })
+}

src/views/reportForm/downList.vue

@@ -0,0 +1,164 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      下载列表
+    </h2>
+    <div class="m-core">
+      <save-form :inline="true" :model="searchForm" @submit="search" @reset='onReSet'>
+        <el-form-item prop="type">
+          <!-- downTypeList -->
+           <el-form-item>
+          <el-select
+            v-model.trim="searchForm.type"
+            clearable
+            filterable
+            placeholder="文件搜索类型"
+          >
+            <el-option
+              v-for="(item, index) in downTypeList"
+              :key="index"
+              :value="item.value"
+              :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button native-type="submit" type="primary">搜索</el-button>
+          <el-button native-type="reset" type="danger">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            width="120"
+            align="center"
+            prop="id"
+            label="下载编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            label="文件名"
+          ></el-table-column>
+          <el-table-column align="center" prop="type" label="文件类型">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.type |downListType }}
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="status" label="文件状态">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.status == 0 ? "生成中" : "已生成" }}
+              </div>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop=" createTime" label="生成时间">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.createTime | dateForMinFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fileUrl" label="下载地址" align="center">
+            <template slot-scope="scope">
+              <div>
+                <a
+                  :href="scope.row.fileUrl"
+                  target="view_window"
+                  v-if="scope.row.status != 0"
+                  style="color: #14928a"
+                  >点击下载</a
+                >
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import {downTypeList} from "@/utils/searchArray"
+import { managerDownloadList } from "./api";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        order: null,
+        userId: null,
+      },
+      downTypeList,
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getList();
+    },
+    async getList() {
+      try {
+        const res = await managerDownloadList({
+          ...this.searchForm,
+          page: this.rules.page,
+          rows: this.rules.limit,
+        });
+        this.tableList = res.data.rows;
+        this.rules.total = res.data.total;
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {
+      this.searchForm.type = null;
+      this.search()
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/serverDetail/index.vue

@@ -80,7 +80,7 @@
             end-placeholder="结束日期"
             :clearable="false"
             @change="changeWeek"
-            :picker-options="bigin"
+            :picker-options="bigin()"
           >
           </el-date-picker>
         </el-form-item>

src/views/teamDetail/componentClass/classCompound.vue

@@ -14,19 +14,36 @@
 
             <el-divider></el-divider>
           </div>
-          <el-button type="text" style="float: right" @click="clearCom"
+          <div class="topWrap">
+             <el-select
+            placeholder="请选择主班"
+            v-model="radio"
+            clearable
+            @change="changeMasterClass"
+          >
+            <el-option
+              v-for="(item, index) in dataList"
+              :label="item.name"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+             <el-button type="text" style="float: right" @click="clearCom"
             >清空列表</el-button
           >
+          </div>
+
           <div>
-            <el-radio-group v-model="radio" @change="changeMasterClass">
+            <!-- <el-radio-group v-model="radio" @change="changeMasterClass"> -->
               <el-table
                 :data="dataList"
                 height="300px"
                 :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
               >
-                <el-table-column align="center" label="主班" width="110">
+                <el-table-column align="center" label="班级编号" width="110">
                   <template slot-scope="scope">
-                    <el-radio :label="scope.row.id"></el-radio>
+                    {{scope.row.id}}
+                    <!-- <el-radio :label="scope.row.id"></el-radio> -->
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -69,7 +86,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-            </el-radio-group>
+            <!-- </el-radio-group> -->
           </div>
           <el-button
             type="primary"
@@ -164,6 +181,9 @@ export default {
   },
   methods: {
     cancleCom(row) {
+      if(row.id== this.radio){
+        this.radio = ''
+      }
       this.$emit("cancleCompound", row);
     },
     clearCom() {
@@ -326,6 +346,10 @@ export default {
 /deep/.el-divider--horizontal {
   margin: 0 !important;
 }
+.topWrap{
+  margin: 10px 0;
+  padding: 0 20px 0 0;
+}
 .minus {
   float: right;
   line-height: 44px;