Merge branch 'dev-coupon-1020' into release

* dev-coupon-1020:
  汇总与明细表下载

# Conflicts:
#	src/utils/fetch.js

package-lock.json

@@ -2961,8 +2961,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2983,14 +2982,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3005,20 +3002,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3135,8 +3129,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3148,7 +3141,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3163,7 +3155,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3171,14 +3162,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -3197,7 +3186,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3278,8 +3266,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3291,7 +3278,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3377,8 +3363,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3414,7 +3399,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3434,7 +3418,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3478,14 +3461,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4467,7 +4448,7 @@
       "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
       "requires": {
         "canvg": "1.5.3",
-        "file-saver": "github:eligrey/FileSaver.js#1.3.8",
+        "file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
         "html2canvas": "1.0.0-alpha.12",
         "omggif": "1.0.7",
         "promise-polyfill": "8.1.0",

src/router/router.js

@@ -17,6 +17,8 @@ const editCme = r => require.ensure([], () => r(require('../views/education/edit
 const editProfessionalExam = r => require.ensure([], () => r(require('../views/education/edit-professional-exam.vue')), 'edit-professional-exam')
 const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
 const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
+const reportDownload = r => require.ensure([], () => r(require('../views/education/report-download.vue')), 'report-download')
+
 
 import patientsRouters from './patients'
 import followRouters from './follow'
@@ -111,8 +113,11 @@ export default [{
           path: '/edit-professional-exam',
           component: editProfessionalExam
         },{
-          path: '/subject-manager',
-          component: subjectManager
+            path: '/subject-manager',
+            component: subjectManager
+        },{
+            path: '/report-download',
+            component: reportDownload
         },{
           path: '/edit-subject',
           component: editSubject

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'C5172D7D7825463CA46752A894236AC2';
+      config.headers['token'] = '663645D26D40417AA86E5395D933E7B7';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/report-download.vue

+<template>
+  <div class="report-download-wrap">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+
+    <div class="component-content screenSet" id="screenSet" style="min-height: 300px;">
+      <div class="header-title">汇总与明细表下载</div>
+
+      <el-form class="demo-form-inline" >
+        <el-form-item>
+          <el-button size="small" type="primary" @click="download">汇总与明细表下载</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 删除 弹窗 -->
+      <!-- <el-dialog
+        title="确认要删除该项目模版吗？"
+        :show-close=false
+        :visible.sync="deleteVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center>
+        <p style="text-align: center;">删除后该模版将不在列表显示</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="deleteVisible=false">取 消</el-button>
+          <el-button type="primary" @click="confirmDelete">删 除</el-button>
+        </span>
+      </el-dialog> -->
+
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/breadcrumb.vue";
+import dialog from "../../components/education/template/dialog";
+import { openLoading, closeLoading } from "../../utils/utils";
+import * as commonUtil from "../../utils/utils";
+let vm = null;
+export default {
+  data() {
+    return {
+      curmbFirst: "教培项目",
+      curmbSecond: "汇总与明细表下载",
+    }
+  },
+  components: {
+    BreadCrumb,
+    dialogCompont: dialog
+  },
+  created() {
+    vm = this;
+  },
+  mounte() {
+    // commonUtil.resizeHeight();
+  },
+  methods: {
+
+    // 查询列表
+    download() {
+      let req = {};
+      // req = vm.formInline;
+      openLoading(vm);
+      vm.POST("stats/export/whole", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          if(res.data == 1) {
+            vm.$message.success('下载成功，请移至“下载报告”页面的“导出列表”中查看');
+          } else {
+            vm.$message.error('下载失败，请联系管理员或拨打咨询电话：400-920-8877');
+          }
+        }
+      });
+    },
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+  .report-download-wrap {
+    .component-content {
+      background: #fff;
+      padding: 10px;
+      .header-title {
+        padding: 10px 12px 10px 0;
+        font-size: 12px;
+        color: #449284;
+        border-bottom: 1px solid #efefef;
+      }
+      .demo-form-inline {
+        margin-top: 20px;
+      }
+    }
+  }
+</style>

src/views/layout/slidebar.vue

@@ -369,6 +369,12 @@
           index: 'subject-manager'
         };
 
+        const reportDownLoad = {
+          title: '汇总与明细表下载',
+          icon: 'el-icon-setting',
+          index: 'report-download'
+        };
+
         const eduRole = {
           title: '角色权限',
           icon: 'el-icon-menu',
@@ -433,6 +439,8 @@
         vm.items[1].subs.push(templateManager);
         vm.items[1].subs.push(followSider);
         vm.items[1].subs.push(advertSimpleManage);
+        vm.items[1].subs.push(reportDownLoad);
+        
         vm.items.push(eduRole);
         vm.items.push(cme);
         vm.items.push(yqRange);