1

1

src/constant/index.js

@@ -113,7 +113,7 @@ export const auditPaymentType = {
   ADD_COURSE: '临时加课',
   MUSIC_APPLY: '乐团报名',
   MUSIC_RENEW: '乐团续费',
-  SPAN_GROUP_CLASS_ADJUST: '跨团合班',
+  SPAN_GROUP_CLASS_ADJUST: '合班缴费',
 }
 
 export const orderServerType = {

src/utils/downLoadFile.js

@@ -27,7 +27,7 @@ export const Export = (that, params, message) => {
         responseType: "blob"
     };
     if(options.method == 'post') {
-        options.data = params.params
+        options.data =params.params
     } else {
         options.params = params.params
     }

src/views/auditList/index.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      审核列表
+      费用审核列表
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->

src/views/businessManager/orderManager/income.vue

@@ -263,11 +263,11 @@
           </el-table-column>
           <el-table-column align="center" label="学员姓名">
             <template slot-scope="scope">
-              <copy-text> {{ scope.row.user.username }}</copy-text>
+              <copy-text v-if="scope.row.user.username"> {{ scope.row.user.username }}</copy-text>
               <span v-if="scope.row.user.username && scope.row.user.phone"
                 >/</span
               >
-              <copy-text>
+              <copy-text v-if="scope.row.user.phone">
                 {{ scope.row.user.phone }}
               </copy-text>
             </template>

src/views/main/baseinfo/index.vue

@@ -85,6 +85,7 @@ export default {
   data () {
     return {
       pickerOptions: {
+          firstDayOfWeek: 1,
         disabledDate: a => {
           const { dayjs } = this.$helpers
           return dayjs(a).isAfter(dayjs().subtract(1, 'day'))

src/views/main/constant.js

@@ -106,6 +106,7 @@ export const errorType = {
     query: {
       searchType: 'ERR_ATTENDANCE',
       ...dates,
+      start: dayjs('2021-02-20').isBefore(dayjs(dates.start)) ? dates.start : '2021-02-20',
     },
   },
   TEACHER_NOT_A_CLASS: {

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -616,6 +616,13 @@ export default {
           query: { ...this.$route.query },
         });
       }
+      if(query.type == "look"){
+         this.$store.dispatch("delVisitedViews", this.$route);
+        this.$router.push({
+          path: "/business/teamLookBase",
+          query: { ...this.$route.query },
+        });
+      }
     },
     handleSelectionChange(val) {
       this.activeChiose = val;

src/views/teacherManager/teacherList.vue

@@ -516,6 +516,7 @@ export default {
         subjectId: null,
         search: null,
       };
+      this.search()
     },
     resetPassWrod(row) {
       this.activatedRow = row;

src/views/teamDetail/componentClass/calenderStudentList.vue

@@ -10,7 +10,7 @@
     />
     <otherform :form="other" ref="other" />
     <div style="margin-bottom: 20px">
-      <el-button type="primary" @click="dialogVisible = true">一件修改差价</el-button>
+      <el-button type="primary" @click="dialogVisible = true">一键修改差价</el-button>
       <el-button type="primary" @click="init">还原差价</el-button>
     </div>
     <el-table

src/views/teamDetail/teamClassList.vue

@@ -18,7 +18,7 @@
             v-model.trim="searchForm.search"
             clearable
             @keyup.enter.native="search"
-            placeholder="乐团&班级编号"
+            placeholder="乐团&班级编号名称"
           ></el-input>
         </el-form-item>
         <el-form-item prop="organIdList">
@@ -74,6 +74,7 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
+          <el-button  type="primary" @click='exportClassGroup'>导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -90,7 +91,7 @@
           <el-table-column
             align="center"
             prop="musicGroupName"
-            label="乐团名称"
+            label="乐团&班级名称"
           ></el-table-column>
           <el-table-column align="center" prop="organName" label="分部名称">
             <template slot-scope="scope">
@@ -219,6 +220,8 @@ import { musicClassTypeList } from "@/utils/searchArray";
 import { getClassGroupPage, removeSingleClass } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
 import classCompound from "./componentClass/classCompound";
+import { Export } from "@/utils/downLoadFile";
+import qs from 'qs'
 export default {
   components: { pagination, classCompound },
   data() {
@@ -360,6 +363,18 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
+    exportClassGroup(){
+        let params = this.searchForm;
+      Export(
+        this,
+        {
+            method: 'post',
+          url: "/api-web/export/classGroup",
+           params:qs.stringify({...params, organIdList: this.searchForm.organIdList.join(",")})
+        },
+        "是否确认导出报表？"
+      );
+    }
   },
 };
 </script>

src/views/teamDetail/teamInfo.vue

@@ -79,7 +79,7 @@ export default {
       this.activeIndex = val.name;
     },
     onCancel () {
-       this.$store.dispatch('delVisitedViews', this.$route) 
+       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({ path: '/business/teamDetail'})
     },
     getname (name) {
@@ -94,7 +94,8 @@ export default {
   components: {
     baseInfo,
     soundeDetail,
-    resetPayList, resetPayListSchool,
+    resetPayList,
+    resetPayListSchool,
   }
 }
 </script>

src/views/vipClass/vipDetail/index.vue

@@ -89,7 +89,7 @@ export default {
 
     },
     onCancel () {
-       this.$store.dispatch('delVisitedViews', this.$route) 
+       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({ path: '/business/vipList' })
     }
   }