Merge branch 'main_master' into 04/27-resetBug

dist/static/css/chunk-0fb777e7.aaa1c265.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-fbc5ce0a]{margin-top:20px}.m-container .m-core .m-wrap[data-v-fbc5ce0a]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-fbc5ce0a]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-fbc5ce0a]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-fbc5ce0a]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-fbc5ce0a]{width:20px;height:20px;position:relative;top:12px}[data-v-fbc5ce0a] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-12514954.a660d258.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-7ab55b1a]{margin-top:20px}.m-container .m-core .m-wrap[data-v-7ab55b1a]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-7ab55b1a]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-7ab55b1a]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-7ab55b1a]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-7ab55b1a]{width:20px;height:20px;position:relative;top:12px}[data-v-7ab55b1a] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-133edf4d.d23d7ee7.css

@@ -1 +0,0 @@
-.box-card[data-v-bdb4499a]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:102px;width:102px;margin-bottom:20px}

dist/static/css/chunk-4794bab7.d54d6e11.css → dist/static/css/chunk-1ca30b97.9cf11ea3.css

@@ -1 +1 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-df7c165a] .description-title{margin:0!important}
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-1ad322b9] .description-title{margin:0!important}

dist/static/css/chunk-2c146260.d520790d.css

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

dist/static/css/chunk-34764697.cc9ecaa9.css

@@ -0,0 +1 @@
+.payForm[data-v-3d1ffe73] .el-form-item{min-width:40%}.newBand[data-v-70174412]{display:inline-block}.noWrap[data-v-70174412]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

dist/static/css/chunk-3c82631e.9e91f9a5.css

@@ -1 +0,0 @@
-.newBand[data-v-7387aea1]{display:inline-block;margin-right:10px}.right-code .title[data-v-7387aea1]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-7387aea1] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-4ba48a58.027bbc03.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-465245c4],.el-button--primary[data-v-465245c4]:active,.el-button--primary[data-v-465245c4]:focus,.el-button--primary[data-v-465245c4]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-465245c4] .el-select{width:100%!important}.el-vue-search-box-container[data-v-465245c4]{position:absolute!important;left:10px;margin-top:10px;z-index:99999!important}

dist/static/css/chunk-b5f3834c.8d89c814.css → dist/static/css/chunk-58b93a1a.9b5fef39.css

@@ -1 +1 @@
-.newBand[data-v-40ee6f00]{display:inline-block}[data-v-40ee6f00] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-40ee6f00]{display:inline-block}.lookTitle[data-v-40ee6f00]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-40ee6f00]{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-40ee6f00]{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-13027298]{display:inline-block}[data-v-13027298] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-13027298]{display:inline-block}.lookTitle[data-v-13027298]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-13027298]{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-13027298]{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}

dist/static/css/chunk-5b96ae80.a9332e3e.css

@@ -0,0 +1 @@
+.newBand[data-v-344c6baa]{display:inline-block;margin-right:10px}.right-code .title[data-v-344c6baa]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-344c6baa] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-5ec9261c.255ef4d3.css → dist/static/css/chunk-60aaefa0.6f6c51cd.css

@@ -1 +1 @@
-.schoolCell[data-v-59b9bbad]{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-59b9bbad] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.schoolCell[data-v-4bc252c9]{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-4bc252c9] .el-textarea.is-disabled .el-textarea__inner{color:#333}

dist/static/css/chunk-2fa64fd2.f356e152.css → dist/static/css/chunk-60aeb093.a93bcaf5.css

@@ -1 +1 @@
-.btnList[data-v-f3ed46a2]{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}.code-url[data-v-f3ed46a2]{margin-top:10px}
+.btnList[data-v-6079d03f]{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}.code-url[data-v-6079d03f]{margin-top:10px}

dist/static/css/chunk-7842ffae.84503b13.css

@@ -1 +0,0 @@
-.payForm[data-v-3d1ffe73] .el-form-item{min-width:40%}.newBand[data-v-1393b508]{display:inline-block}.noWrap[data-v-1393b508]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

dist/static/css/chunk-929c4556.88086bf5.css

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

dist/static/css/chunk-214fb7c2.c6772f04.css → dist/static/css/chunk-99129380.7b01fa8d.css

@@ -1 +1 @@
-.newBand[data-v-46bcfc90]{display:inline-block}[data-v-46bcfc90] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-46bcfc90]{display:inline-block}.lookTitle[data-v-46bcfc90]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-46bcfc90]{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-46bcfc90]{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-dfdc8678]{display:inline-block}[data-v-dfdc8678] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-dfdc8678]{display:inline-block}.lookTitle[data-v-dfdc8678]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-dfdc8678]{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-dfdc8678]{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}

dist/static/css/chunk-a2310078.24d72d0f.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-3d1d6e2c],.el-button--primary[data-v-3d1d6e2c]:active,.el-button--primary[data-v-3d1d6e2c]:focus,.el-button--primary[data-v-3d1d6e2c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3d1d6e2c] .el-select{width:100%!important}.el-vue-search-box-container[data-v-3d1d6e2c]{position:absolute!important;left:10px;margin-top:10px;z-index:99999!important}

dist/static/css/chunk-75855639.794f4741.css → dist/static/css/chunk-a55fdac2.cc94a765.css

@@ -1 +1 @@
-.schoolCell[data-v-0341c9a4]{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-0341c9a4] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-59b9bbad]{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-59b9bbad] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.schoolCell[data-v-0341c9a4]{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-0341c9a4] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4bc252c9]{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-4bc252c9] .el-textarea.is-disabled .el-textarea__inner{color:#333}

dist/static/css/chunk-be3bf066.ecdc8345.css

@@ -0,0 +1 @@
+.box-card[data-v-50daefe5]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:102px;width:102px;margin-bottom:20px}

src/utils/downLoadFile.js

@@ -53,7 +53,7 @@ export const Export = (that, params, message) => {
                 } else {
                     let objectUrl = URL.createObjectURL(blob);
                     let link = document.createElement("a");
-                    let fname = params.fileName || "导出文件.xlsx"; //下载文件的名字
+                    let fname = params.fileName || "导出文件.xls"; //下载文件的名字
                     link.href = objectUrl;
                     link.setAttribute("download", fname);
                     document.body.appendChild(link);

src/views/afterSchoolManager/afterWorkList.vue

@@ -349,7 +349,7 @@ export default {
       let obj = this.getDate();
       await Export(this, {
         url: '/api-web/export/extraExercisesReplys',
-        fileName: '课外训练(学员).xlsx',
+        fileName: '课外训练(学员).xls',
         method: 'get',
         params: obj
       }, '您确定导出列表?')

src/views/arrearage-students/index.vue

@@ -288,7 +288,7 @@ export default {
       const { organIds, ...rest} = this.searchForm
       Export(this, {
         url: '/api-web/export/arrearageStudents',
-        fileName: '欠费学员.xlsx',
+        fileName: '欠费学员.xls',
         method: 'post',
         params: qs.stringify({ organIds: organIds.join(','), ...rest })
       }, '您确定导出欠费学员列表?')

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -1157,7 +1157,7 @@ export default {
         params: {
           templateType: "ROUTE_ORDER",
         },
-        fileName: "财务管理导入模板.xlsx",
+        fileName: "财务管理导入模板.xls",
       });
     },
     beforeUpload(file) {

src/views/businessManager/orderManager/financeManager.vue

@@ -1173,7 +1173,7 @@ export default {
         params: {
           templateType: "ROUTE_ORDER",
         },
-        fileName: "财务管理导入模板.xlsx",
+        fileName: "财务管理导入模板.xls",
       });
     },
     beforeUpload(file) {

src/views/businessManager/orderManager/payRecord.vue

@@ -410,7 +410,7 @@ export default {
     downloadFile() {
       Export(this, {
         url: "/api-web/import/downloadTemplate",
-        fileName: "财务支出导入模板.xlsx",
+        fileName: "财务支出导入模板.xls",
         params: {
           templateType: "FINANCIAL_EXPENDITURE",
         },

src/views/businessManager/shopManager/shopList.vue

@@ -990,14 +990,14 @@ export default {
         params: {
           templateType: 'GOODS'
         },
-        fileName: '商品导入模板.xlsx'
+        fileName: '商品导入模板.xls'
       })
     },
     exportShopList(){
       Export(this, {
         url: "/api-web/export/goods",
         params: qs.stringify(cleanDeep(this.searchForm)),
-        fileName: '商品导出.xlsx',
+        fileName: '商品导出.xls',
         method:'post'
       }, '确定导出商品')
     },

src/views/categroyManager/insideSetting/branchManager.vue

@@ -300,7 +300,7 @@ export default {
     onExport () {
       Export(this, {
         url: '/api-web/export/cooperationOrgan',
-        fileName: '合作单位.xlsx',
+        fileName: '合作单位.xls',
         method: 'post',
         params: qs.stringify(cleanDeep(this.searchForm))
       }, '您确定导出合作单位?')

src/views/categroyManager/vipActiveList.vue

@@ -740,7 +740,7 @@ export default {
         this,
         {
           url: "/api-web/export/vipGroupActivity",
-          fileName: "活动列表.xlsx",
+          fileName: "活动列表.xls",
           method: "post",
           params: qs.stringify(cleanDeep(obj)),
         },

src/views/musicInspection/index.vue

@@ -396,7 +396,7 @@ export default {
         this,
         {
           url: "/api-web/inspectionItemPlanConclusion/exportPlanConclusion",
-          fileName: "巡查结果.xlsx",
+          fileName: "巡查结果.xls",
           method: "get",
           params: {
             planId: row.id,

src/views/operationalEarly/operationalList.vue

@@ -262,7 +262,7 @@ export default {
         this,
         {
           url: "/api-web/export/teacherCourseStatistics",
-          fileName: "运营预警.xlsx",
+          fileName: "运营预警.xls",
           method: "post",
           params: qs.stringify({
             ...rest

src/views/reaplceMusicPlayer/index.vue

@@ -310,7 +310,7 @@ export default {
         this,
         {
           url: "/api-web/replacementInstrumentActivity/export",
-          fileName: "乐器置换列表.xlsx",
+          fileName: "乐器置换列表.xls",
           method: "post",
           params: qs.stringify(cleanDeep(obj)),
         },

src/views/repairManager/repairList.vue

@@ -582,7 +582,7 @@ export default {
       const {timer, ...rest} = this.searchForm
       Export(this, {
         url: '/api-web/studentRepair/export',
-        fileName: '维修单.xlsx',
+        fileName: '维修单.xls',
         method: 'post',
         params: qs.stringify({ ...rest, ...getTimes(timer, ["startTime", "endTime"]) })
       }, '您确定导出维修单列表?')

src/views/reportForm/index.vue

@@ -552,7 +552,7 @@ export default {
       }
       Export(this, {
         url: '/api-web/export/exportStudentAttendances',
-        fileName: '学生考勤.xlsx',
+        fileName: '学生考勤.xls',
         method: 'post',
         params: qs.stringify({ organId: this.attendanceOrganId.join(','), groupType: this.attendanceCourseType, classStartDate, classEndDate })
       }, '您确定导出学生考勤?')
@@ -571,7 +571,7 @@ export default {
       }
       Export(this, {
         url: '/api-web/studentInstrument/export',
-        fileName: '乐保订单.xlsx',
+        fileName: '乐保订单.xls',
         method: 'get',
         params: { startTime: startTime, endTime: endTime }
       }, '您确定导出乐保订单?')

src/views/serverDetail/index.vue

@@ -405,7 +405,7 @@ export default {
         this,
         {
           url: "/api-web/export/teacherServeInfo",
-          fileName: "服务指标明细.xlsx",
+          fileName: "服务指标明细.xls",
           method: "post",
           params: qs.stringify({
             ...rest,

src/views/stuRecodeManager/index.vue

@@ -459,7 +459,7 @@ export default {
         this,
         {
           url: "/api-web/export/exportStudentAttendances",
-          fileName: "考勤列表.xlsx",
+          fileName: "考勤列表.xls",
           method: "post",
           params: qs.stringify(cleanDeep(obj)),
         },

src/views/studentManager/studentList.vue

@@ -855,7 +855,7 @@ export default {
                     nowTime.getFullYear() +
                     (nowTime.getMonth() + 1) +
                     nowTime.getDate();
-                  let fname = `导出学员名单` + ymd + ".xlsx"; //下载文件的名字
+                  let fname = `导出学员名单` + ymd + ".xls"; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

src/views/teamBuild/forecastName.vue

@@ -316,7 +316,7 @@ export default {
                         ...params,
                         musicGroupId: this.musicGroupId
                     },
-                    fileName: '预报名列表.xlsx'
+                    fileName: '预报名列表.xls'
                 },
                 "是否确认导出报表？"
             );

src/views/vipClass/vipList.vue

@@ -613,7 +613,7 @@ export default {
                   let objectUrl = URL.createObjectURL(blob);
                   let link = document.createElement("a");
                   let fname =
-                    "VIP课程续费提醒" + new Date().getTime() + ".xlsx"; //下载文件的名字
+                    "VIP课程续费提醒" + new Date().getTime() + ".xls"; //下载文件的名字
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

src/views/withdrawal-application/index.vue

@@ -216,7 +216,7 @@ export default {
       const { ...rest} = this.searchForm
       Export(this, {
         url: '/api-web/export/musicGroupQuit',
-        fileName: '退团申请.xlsx',
+        fileName: '退团申请.xls',
         method: 'post',
         params: qs.stringify({ visitFlag: this.$route.query.visitFlag, ...rest })
       }, '您确定导出退团申请列表?')