合并分支

dist/static/css/chunk-26fbd95e.85647594.css

@@ -0,0 +1 @@
+.m-container[data-v-769459c3]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-769459c3]{display:inline-block}

dist/static/css/chunk-3c0cdab6.fe653051.css

@@ -0,0 +1 @@
+.topWrap[data-v-7f515ff1]{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}.topWrap div[data-v-7f515ff1]{margin-right:10px}

dist/static/css/chunk-4c743e39.22311ef1.css

@@ -0,0 +1 @@
+.wrap[data-v-4bbd44c6]{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}.wrap .leftCell[data-v-4bbd44c6]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4bbd44c6],.wrap .rightCell[data-v-4bbd44c6]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-4bbd44c6]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-4bbd44c6]{margin-right:30px}[data-v-4bbd44c6] .el-tag{cursor:pointer}

dist/static/css/chunk-4d2bb3b0.c5be8ad9.css

@@ -1 +1,9 @@
-.wrap[data-v-17367224]{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}.wrap .leftCell[data-v-17367224]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-17367224],.wrap .rightCell[data-v-17367224]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-17367224]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-17367224]{margin-right:30px}[data-v-17367224] .el-tag{cursor:pointer}
+<<<<<<< HEAD
+.wrap[data-v-17367224]{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}.wrap .leftCell[data-v-17367224]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-17367224],.wrap .rightCell[data-v-17367224]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-17367224]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-17367224]{margin-right:30px}[data-v-17367224] .el-tag{cursor:pointer}
+=======
+<<<<<<< HEAD:dist/static/css/chunk-a4e62e66.22311ef1.css
+.wrap[data-v-4bbd44c6]{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}.wrap .leftCell[data-v-4bbd44c6]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4bbd44c6],.wrap .rightCell[data-v-4bbd44c6]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-4bbd44c6]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-4bbd44c6]{margin-right:30px}[data-v-4bbd44c6] .el-tag{cursor:pointer}
+=======
+.wrap[data-v-17367224]{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}.wrap .leftCell[data-v-17367224]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-17367224],.wrap .rightCell[data-v-17367224]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-17367224]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-17367224]{margin-right:30px}[data-v-17367224] .el-tag{cursor:pointer}
+>>>>>>> ol_12_30:dist/static/css/chunk-4d2bb3b0.c5be8ad9.css
+>>>>>>> ol_12_30

dist/static/css/chunk-a4e62e66.22311ef1.css

@@ -1 +1,5 @@
-.wrap[data-v-4bbd44c6]{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}.wrap .leftCell[data-v-4bbd44c6]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4bbd44c6],.wrap .rightCell[data-v-4bbd44c6]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-4bbd44c6]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-4bbd44c6]{margin-right:30px}[data-v-4bbd44c6] .el-tag{cursor:pointer}
+<<<<<<< HEAD:dist/static/css/chunk-a4e62e66.22311ef1.css
+.wrap[data-v-4bbd44c6]{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}.wrap .leftCell[data-v-4bbd44c6]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-4bbd44c6],.wrap .rightCell[data-v-4bbd44c6]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-4bbd44c6]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-4bbd44c6]{margin-right:30px}[data-v-4bbd44c6] .el-tag{cursor:pointer}
+=======
+.wrap[data-v-17367224]{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}.wrap .leftCell[data-v-17367224]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-17367224],.wrap .rightCell[data-v-17367224]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-17367224]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-17367224]{margin-right:30px}[data-v-17367224] .el-tag{cursor:pointer}
+>>>>>>> ol_12_30:dist/static/css/chunk-4d2bb3b0.c5be8ad9.css

dist/static/css/chunk-c0098a4a.ea15bf90.css

@@ -0,0 +1 @@
+.schoolCell[data-v-6a312748]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-6a312748] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-746bf9ee]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-746bf9ee] .el-textarea.is-disabled .el-textarea__inner{color:#333}

src/views/accompanyManager/accompanyList.vue

@@ -8,9 +8,9 @@
         class="newBand"
         v-permission="'export/practiceGroup'"
         @click="onStudentExport"
-        style="width: 120px"
+        style="width: 150px; max-width:150px"
       >
-        网管课续费提醒
+        网管课续费提醒导出
       </div>
       <div
         class="newBand"
@@ -476,7 +476,7 @@ export default {
                 } else {
                   let objectUrl = URL.createObjectURL(blob);
                   let link = document.createElement("a");
-                  let fname = "网管课续费提醒" + new Date().getTime(); //下载文件的名字
+                  let fname = "网管课续费提醒" + new Date().getTime() + '.xls'; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -357,7 +357,7 @@ export default {
                     nowTime.getHours() +
                     "" +
                     nowTime.getMinutes();
-                  let fname = ymd + "课外训练(教学)";
+                  let fname = ymd + "课外训练(教学).xls";
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

src/views/afterSchoolManager/afterWorkList.vue

@@ -259,6 +259,7 @@ import {
   findStudentExtraExerciseDetail
 } from "@/api/afterSchool";
 import { getEmployeeOrgan } from "@/api/buildTeam";
+import { Export } from '@/utils/downLoadFile'
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 export default {
@@ -341,52 +342,15 @@ export default {
       this.getList();
     },
     // 导出
-    onExport () {
-      let url = "/api-web/export/extraExercisesReplys";
+    async onExport () {
       let obj = this.getDate();
-      const options = {
-        method: "get",
-        headers: {
-          Authorization: getToken()
-        },
-        url,
-        params: obj,
-        responseType: "blob"
-      };
-
-      this.$confirm("您确定导出列表?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          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 = ymd + "课外训练(学员).xls";
-            link.href = objectUrl;
-            link.setAttribute("download", fname);
-            document.body.appendChild(link);
-            link.click();
-          });
-        })
-        .catch(() => { });
+      console.log(obj)
+      await Export(this, {
+        url: '/api-web/export/extraExercisesReplys',
+        fileName: '课外训练(学员).xlsx',
+        method: 'get',
+        params: obj
+      }, '您确定导出列表?')
     },
     getDate () {
       let obj = {};

src/views/businessManager/orderManager/incomeOut.vue

@@ -313,7 +313,7 @@ export default {
                     nowTime.getHours() +
                     "" +
                     nowTime.getMinutes();
-                  let fname = "报表导出" + new Date().getTime(); //下载文件的名字
+                  let fname = "报表导出" + new Date().getTime()+'.xls'; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

src/views/teamDetail/components/baseInfo.vue

@@ -193,7 +193,7 @@ export default {
               let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
                 nowTime.getHours() +
                 '' + nowTime.getMinutes()
-              let fname = this.$route.query.id + '-' + ymd + '订货清单' //下载文件的名字
+              let fname = this.$route.query.id + '-' + ymd + '订货清单.xls' //下载文件的名字
               link.href = objectUrl
               link.setAttribute("download", fname)
               document.body.appendChild(link)