Merge branch '01/21VipReset' into online

src/router/notKeepAliveList.js

@@ -76,6 +76,7 @@ export default [
   '/orderList/incomeOut', // 对外订单管理
   '/business/signupList', // 报名缴费
   '/business/teamDetails', //进行中 查看
+  '/business/teamTeacherRecord', // 进行中 查看 上课记录
   '/business/teamLookBase', // 筹备中 乐团信息
   '/business/vipReset', // vip修改
   '/business/vipDetail', // vip查看

src/views/adapayAccount/form.vue

@@ -375,6 +375,7 @@ export default {
       this.files = null
       this.fileList = []
       this.form.multipartFile = null
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/insideSetting/adapayManager"
       });

src/views/app/entryOperation.vue

@@ -349,6 +349,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: "/insideSetting/entryActivities"
         });
@@ -357,6 +358,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/insideSetting/entryActivities"
       });

src/views/buildVip/index.vue

@@ -1491,6 +1491,7 @@ export default {
                 //   message: '提交成功!'
                 // });
                 this.$message.success("提交成功");
+                this.$store.dispatch('delVisitedViews', this.$route)
                 this.$router.push({
                   path: "/business/vipList",
                   query: {
@@ -1501,6 +1502,7 @@ export default {
               });
             } else {
               this.$message.success("恭喜您创建成功");
+              this.$store.dispatch('delVisitedViews', this.$route)
               this.$router.push({
                 path: "/business/vipList",
                 query: {
@@ -1610,6 +1612,7 @@ export default {
       }
     },
     onCancel() {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/business/vipList",
         query: {

src/views/businessManager/shopManager/shopOperation.vue

@@ -422,6 +422,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: '/shopManager/shopManager',
           query: {
@@ -434,6 +435,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: '/shopManager/shopManager'
       })

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -134,6 +134,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({ path: '/specialSetup/adminManager', query: { page: this.page } })
       } else {
         this.$message.error(res.msg)
@@ -237,6 +238,7 @@ export default {
       this.checkAll = false
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: '/specialSetup/adminManager',
         query: {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -298,12 +298,14 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success('修改成功')
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
     },
     resetForm () {

src/views/categroyManager/vipNewActive.vue

@@ -426,6 +426,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("恭喜你,活动创建成功");
               this.onReSet();
+              this.$store.dispatch('delVisitedViews', this.$route)
               this.$router.push({
                 path: "/vipClassSet/vipActiveList"
               });
@@ -459,6 +460,7 @@ export default {
       this.$forceUpdate()
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/vipClassSet/vipActiveList",
         query: { rules: this.rules, searchForm: this.searchForm }

src/views/contentManager/contentOperation.vue

@@ -633,6 +633,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
+        this.$store.dispatch('delVisitedViews', this.$route)
         this.$router.push({
           path: "/contentManager/contentManager",
           query: {
@@ -644,6 +645,7 @@ export default {
       }
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/contentManager/contentManager",
         query: {

src/views/studentManager/components/studentInfo.vue

@@ -1,100 +1,123 @@
 <template>
-  <div class='studentDetail'>
-    <el-form :inline="true">
-      <el-form-item label="学生姓名">
-        <el-input disabled
-                  :value="studentForm.username"></el-input>
-      </el-form-item>
-      <el-form-item label="学生性别">
-        <el-input :value="studentForm.gender ? '男':'女'"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="出生年月">
-        <el-input :value="studentForm.birthdate"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="家长姓名">
-        <el-input :value="studentForm.realName"
-                  disabled></el-input>
-      </el-form-item>
-      <el-form-item label="联系电话">
-        <el-input :value="studentForm.parentsPhone"
-                  disabled></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="所在学校">
-        <el-input :value=""
-                  disabled></el-input>
-      </el-form-item> -->
-      <!-- <el-form-item label="所属分部">
-        <el-input :value="1"
-                  disabled></el-input>
-      </el-form-item> -->
-      <el-form-item label="年级班级">
-        <el-input :value="studentForm.currentGrade + studentForm.currentClass"
-                  disabled></el-input>
-      </el-form-item>
+  <div class="studentDetail">
+    <el-form ref="form" label-width="130px">
+      <el-row>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学生姓名">
+            <el-input disabled :value="studentForm.username"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学生性别">
+            <el-input :value="studentForm.gender ? '男' : '女'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="出生年月">
+            <el-input :value="studentForm.birthdate" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="家长姓名">
+            <el-input :value="studentForm.realName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="联系电话">
+            <el-input :value="studentForm.parentsPhone" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <!-- <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="年级班级">
+            <el-input
+              :value="studentForm.currentGrade + studentForm.currentClass"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-col> -->
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="所属分部">
+            <el-input :value="studentForm.organName" disabled ></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学员声部">
+            <el-input :value="studentForm.subjectName" disabled ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否运营">
+            <el-input :value="studentForm.operatingTag ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否服务">
+            <el-input :value="studentForm.serviceTag ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="指导老师">
+            <el-input :value="studentForm.teacherName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="是否是新用户">
+            <template slot="label">
+              <p style="position: relative">
+                是否是新用户
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                  </div>
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i>
+                </el-tooltip>
+              </p>
+            </template>
+            <el-input :value="studentForm.isNewUser ? '是' : '否'" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <!-- <div class="teamList">
-      <h4>乐团1</h4>
-      <el-form :inline="true">
-        <el-form-item label="入团日期">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="所在乐团">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="报名声部">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="乐团状态">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="乐器来源">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="所选乐器">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-        <el-form-item label="XX价格">
-          <el-input value="2019-09-26"></el-input>
-        </el-form-item>
-      </el-form>
-    </div> -->
+
   </div>
 </template>
 <script>
-import { findStudentBaseInfo, findStudentMusicGroups } from '@/api/studentManager'
+// import {
+//   findStudentBaseInfo
+// } from "@/api/studentManager";
 export default {
-  name: 'studentInfo',
-  data () {
+  name: "studentInfo",
+  data() {
+    const query = this.$route.query
     return {
-      userId: null,
-      studentForm: {},
-      musicGroupInfo: [] // 乐团信息
-    }
+      studentForm: query || {},
+    };
   },
-  mounted () {
-    this.__init()
+  mounted() {
+    this.__init();
   },
   methods: {
-    __init () {
-      this.userId = this.$route.query.userId
-      findStudentBaseInfo({ userId: this.userId }).then(res => {
-        if (res.code == 200) {
-          this.studentForm = res.data
-        }
-      })
-      // findStudentMusicGroups(this.userId).then(res => {
-      //   if(res.code == 200) {
-      //     this.musicGroupInfo.push(...res.data)
+    __init() {
+      // this.userId = this.$route.query.userId;
+      // findStudentBaseInfo({ userId: this.userId }).then(res => {
+      //   if (res.code == 200) {
+      //     this.studentForm = res.data;
       //   }
-      // })
+      // });
     }
   }
-}
+};
 </script>
 <style lang="scss" scope>
 .studentDetail {
+  margin-top: 20px;
   .teamList {
     margin-top: 20px;
     h4 {

src/views/studentManager/index.vue

@@ -6,31 +6,31 @@
     <div class="m-core">
       <!-- navMenu -->
       <tab-router v-model.trim="activeIndex" type="card" @tab-click="handleClick">
-        <el-tab-pane label="基本信息" v-if="permissionList.studentInfo" name="1">
+        <el-tab-pane label="基本信息" lazy v-if="permissionList.studentInfo" name="1">
           <studentInfo v-if="activeIndex == 1" />
         </el-tab-pane>
-        <el-tab-pane label="乐团&课程" v-if="permissionList.teamAndcourse" name="2">
+        <el-tab-pane label="乐团&课程" lazy v-if="permissionList.teamAndcourse" name="2">
           <teamAndcourse v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="VIP课" v-if="permissionList.studentVip" name="3">
+        <el-tab-pane label="VIP课" lazy v-if="permissionList.studentVip" name="3">
           <studentVip v-if="activeIndex == 3" />
         </el-tab-pane>
-        <el-tab-pane label="对外课" v-if="permissionList.studentOutList" name="4">
+        <el-tab-pane label="对外课" lazy v-if="permissionList.studentOutList" name="4">
           <studentOutList v-if="activeIndex == 4" />
         </el-tab-pane>
-        <el-tab-pane label="网管课" v-if="permissionList.studentNetwork" name="9">
+        <el-tab-pane label="网管课" lazy v-if="permissionList.studentNetwork" name="9">
           <studentNetwork v-if="activeIndex == 9" />
         </el-tab-pane>
-        <el-tab-pane label="课表详情" v-if="permissionList.studentRecord" name="5">
+        <el-tab-pane label="课表详情" lazy v-if="permissionList.studentRecord" name="5">
           <studentRecord v-if="activeIndex == 5" />
         </el-tab-pane>
-        <el-tab-pane label="扣费记录" v-if="permissionList.studentPayList" name="6">
+        <el-tab-pane label="扣费记录" lazy v-if="permissionList.studentPayList" name="6">
           <studentPayList v-if="activeIndex == 6" />
         </el-tab-pane>
-        <el-tab-pane label="学员订单" v-if="permissionList.studentOrder" name="7">
+        <el-tab-pane label="学员订单" lazy v-if="permissionList.studentOrder" name="7">
           <studentOrder v-if="activeIndex == 7" />
         </el-tab-pane>
-        <el-tab-pane label="学员提现" v-if="permissionList.studentCashout" name="8">
+        <el-tab-pane label="学员提现" lazy v-if="permissionList.studentCashout" name="8">
           <studentCashout v-if="activeIndex == 8" />
         </el-tab-pane>
       </tab-router>
@@ -86,7 +86,7 @@ export default {
     if (this.$route.query.rules) {
       this.Frules = this.$route.query.rules;
     }
-    this.studentName = this.$route.query.studentName;
+    this.studentName = this.$route.query.username;
   },
   activated() {
     if (this.$route.query.search) {
@@ -95,7 +95,7 @@ export default {
     if (this.$route.query.rules) {
       this.Frules = this.$route.query.rules;
     }
-    this.studentName = this.$route.query.studentName;
+    this.studentName = this.$route.query.username;
   },
   methods: {
     onCancel() {

src/views/studentManager/studentList.vue

@@ -252,11 +252,10 @@
                 v-permission="'/studentDetail'"
                 class="el-button--text"
                 :to="{
-                  path: `/business/studentDetail?userId=${scope.row.userId}`,
-                  query: { studentName: scope.row.username },
+                  path: `/business/studentDetail`,
+                  query: { ...scope.row },
                 }"
-                >查看</router-link
-              >
+                >查看</router-link>
               <el-button
                 type="text"
                 style="padding-left: 10px;"

src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -284,6 +284,7 @@ export default {
         }).then(res => {
           if (res.code == 200) {
             this.$message.success("保存成功");
+            this.$store.dispatch('delVisitedViews', this.$route)
             this.$router.push({
               path: "/business/teacherList",
               query: { rules: this.Frules, search: this.Fsearch }

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -589,6 +589,7 @@ export default {
                   }).then(res => {
                     if (res.code == 200) {
                       this.$message.success("保存成功");
+                      this.$store.dispatch('delVisitedViews', this.$route)
                       this.$router.push({
                         path: "/business/teacherList",
                         query: { rules: this.Frules, search: this.Fsearch }

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -571,6 +571,7 @@ export default {
             teacherUpdate(this.topForm).then((res) => {
               if (res.code == 200) {
                 // this.$emit('onTeacher')
+                this.$store.dispatch('delVisitedViews', this.$route)
                 this.$router.push({
                   path: "/business/teacherList",
                   query: { rules: this.Frules, search: this.Fsearch },
@@ -588,6 +589,7 @@ export default {
                 if (permission("/teacherAdd/salarySeting")) {
                   this.$emit("onTeacher", res.data);
                 } else {
+                  this.$store.dispatch('delVisitedViews', this.$route)
                   this.$router.push({
                     path: "/business/teacherList",
                     query: { rules: this.Frules, search: this.Fsearch },
@@ -647,6 +649,7 @@ export default {
       this.$refs[formName].resetFields();
     },
     onCancel() {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
         path: "/business/teacherList",
         query: { rules: this.Frules, search: this.Fsearch },

src/views/teacherManager/teacherOperation/index.vue

@@ -85,6 +85,7 @@ export default {
       this.activeStatus[val.name] = true
     },
     onCancel () {
+      this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({ path: '/business/teacherList' })
     },
     onTeacher (id) {

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -1,27 +1,51 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <el-form :inline="true" :model="searchForm">
-      <el-form-item>
-        <el-select
-          v-model.trim="searchForm.classType"
-          placeholder="班级类型"
-          clearable
-          filterable
-          @change="changeClassGetList"
-        >
-          <el-option
-            v-for="(item, index) in classTypeList"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
     <div class="buttonWrap">
-      <div class="newBand" @click="newClass" v-permission="'classGroup/create'">
-        新建班级
+      <div class="left">
+        <el-form :inline="true" :model="searchForm">
+          <el-form-item>
+            <el-select
+              v-model.trim="searchForm.classType"
+              placeholder="班级类型"
+              clearable
+              filterable
+              @change="changeClassGetList"
+            >
+              <el-option
+                v-for="(item, index) in classTypeList"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div
+          class="newBand"
+          @click="newClass"
+          v-permission="'classGroup/create'"
+        >
+          新建班级
+        </div>
+      </div>
+      <div class="right">
+        <el-popover placement="left" width="500" trigger="click">
+          <div class="popoverWrap">
+            <p>线上基础技能班规则：</p>
+            <p>班级数量：</p>
+            <p>
+              乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和（上低音号与长号合并计算）
+            </p>
+            <p>
+              例：乐团有长笛13人、上低音号8人、长号7人，则该乐团可创建上线基础技能班数量为
+            </p>
+            <p>13/6向上取整+（8+7）/6向上取整=3+3=6个线上基础技能班</p>
+            <p>班级人数：</p>
+            <p>线上基础技能班人数为3至6人</p>
+          </div>
+          <div class="newBand" slot="reference">建班规则</div>
+        </el-popover>
       </div>
     </div>
     <div class="tableWrap">
@@ -205,7 +229,11 @@
         </el-form-item>
         <el-form-item
           label="助教老师"
-          v-if="newClassForm.type != 'HIGH_ONLINE' && newClassForm.type != 'HIGH'&&newClassForm.type"
+          v-if="
+            newClassForm.type != 'HIGH_ONLINE' &&
+            newClassForm.type != 'HIGH' &&
+            newClassForm.type
+          "
           prop="teaching"
         >
           <remote-search
@@ -1434,8 +1462,8 @@ export default {
           });
         }
       });
-         this.activeSoundList = this.soundList;
-        this.getNoClassStudent(row.type);
+      this.activeSoundList = this.soundList;
+      this.getNoClassStudent(row.type);
       // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
       //   this.getNoClassStudent(row.type, row.memo);
       //   let arr = row.memo.split(",");
@@ -1809,9 +1837,13 @@ export default {
   box-sizing: border-box;
   padding: 30px 42px;
 }
+.popoverWrap {
+  p{line-height: 25px;}
+}
 .buttonWrap {
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
+  flex-direction: row;
   .newBand {
     margin-right: 20px;
   }
@@ -1821,6 +1853,11 @@ export default {
     line-height: 36px;
     font-size: 14px;
   }
+  .left {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
 }
 .studentMask {
   display: flex;

src/views/teamDetail/components/resetClass.vue

@@ -6,23 +6,42 @@
       班级调整
     </h2>-->
     <div class="m-core">
-      <el-form :inline="true" :model="topForm">
-        <el-form-item label="班级类型">
-          <el-select
-            v-model.trim="topForm.classType"
-            clearable
-            filterable
-            @change="changeMixClass"
-          >
-            <el-option
-              v-for="(item, index) in musicClassTypeList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
+      <div class="topWrap">
+        <el-form :inline="true" :model="topForm">
+          <el-form-item label="班级类型">
+            <el-select
+              v-model.trim="topForm.classType"
+              clearable
+              filterable
+              @change="changeMixClass"
+            >
+              <el-option
+                v-for="(item, index) in musicClassTypeList"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <el-popover placement="left" width="500" trigger="click">
+          <div class="popoverWrap">
+            <p>线上基础技能班规则：</p>
+            <p>班级数量：</p>
+            <p>
+              乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和（上低音号与长号合并计算）
+            </p>
+            <p>
+              例：乐团有长笛13人、上低音号8人、长号7人，则该乐团可创建上线基础技能班数量为
+            </p>
+            <p>13/6向上取整+（8+7）/6向上取整=3+3=6个线上基础技能班</p>
+            <p>班级人数：</p>
+            <p>线上基础技能班人数为3至6人</p>
+          </div>
+          <div class="newBand" slot="reference">建班规则</div>
+        </el-popover>
+      </div>
+
       <div class="tableWrap" style>
         <el-table
           :data="activeSingleList"
@@ -946,7 +965,7 @@ export default {
         }
       });
       this.activeSoundList = this.soundList;
-      this.getNoClassStudent(row.type);// 基础技能班能获取所有
+      this.getNoClassStudent(row.type); // 基础技能班能获取所有
       // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
       //   this.getNoClassStudent(row.type, row.memo);
       //   let arr = row.memo.split(",");
@@ -1572,6 +1591,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.topWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 .floor {
   padding-right: 20px;
   display: flex;

src/views/teamDetail/components/studentList.vue

@@ -45,8 +45,9 @@
     <div style="margin-bottom: 15px;">
       <el-button type="primary" v-permission="'studentRegistration/insertStudent'"
               @click="addStudentVisible = true">新增学员</el-button>
-      <el-button type="primary" v-permission="'/studentSignin'"
-              @click="gotoSignin">点名总览</el-button>
+      <!-- 可以直接去学生考勤查看 -->
+      <!-- <el-button type="primary" v-permission="'/studentSignin'"
+              @click="gotoSignin">点名总览</el-button> -->
       <el-button type="primary" v-permission="'studentManage/queryStudentSubTotalCourseTimes'"
               @click="viewTimer">剩余时长明细</el-button>
     </div>

src/views/teamDetail/components/teacherList.vue

@@ -32,11 +32,12 @@
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
       </el-form-item>
-      <el-form-item style="float: right">
+      <!-- 可以直接去老师考勤列表里面查 -->
+      <!-- <el-form-item style="float: right">
         <div class="right newBand" style="margin-bottom: 0" @click="gotoRecord">
           上课记录
         </div>
-      </el-form-item>
+      </el-form-item> -->
     </save-form>
 
     <!-- 列表 -->

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -99,8 +99,9 @@ export default {
     pagination
   },
   data () {
+    const query = this.$route.query
     return {
-      name: '',
+      name: query.name,
       searchForm: {
         teacher: '',
         timer: []
@@ -117,11 +118,11 @@ export default {
       },
     }
   },
-  created () {
-    this.teamId = this.$route.query.id;
-  },
+  // created () {
+  //   this.teamId = this.$route.query.id;
+  // },
   mounted () {
-    this.name = localStorage.getItem('teamName');
+    // this.name = localStorage.getItem('teamName');
     // findMusicGroupClassTeacher({ musicGroupId: this.teamId }).then(res => {
     //   if (res.code == 200) {
     //     this.teacherList = res.data;

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">
@@ -39,6 +39,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchForm.groupType"
+            clearable
+            filterable
+            placeholder="课程组类型"
+          >
+            <el-option
+              v-for="(item, index) in courseListType"
+              :key="index"
+              :value="item.value"
+              :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <!-- musicClassTypeList -->
         <el-form-item prop="type">
           <el-select v-model.trim="searchForm.type" clearable filterable>
@@ -61,7 +76,7 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
         >
-          <el-table-column align="center" prop="musicGroupId" label="乐团编号">
+          <el-table-column align="center" prop="musicGroupId" label="乐团&课程组编号">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.musicGroupId }}</copy-text>
             </template>
@@ -180,6 +195,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
+import { courseListType } from "@/utils/searchArray";
 import { musicClassTypeList } from "@/utils/searchArray";
 import { getClassGroupPage } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
@@ -192,7 +208,9 @@ export default {
         search: null,
         organIdList: [],
         type: "",
+        groupType: "MUSIC",
       },
+      courseListType: courseListType,
       musicClassTypeList,
       tableList: [],
       compoundList: [],
@@ -242,6 +260,7 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
+      this.searchForm.groupType = 'MUSIC'
       this.search();
     },
     addCompound(row) {
@@ -251,25 +270,28 @@ export default {
       this.compoundList.push(row);
       this.compoundList = [...new Set(this.compoundList)];
 
-        this.compoundList.forEach((classes) => {
-          if (classes.type == "HIGH") {
-            this.hightCount++;
-          }
-          if (classes.type == "HIGH_ONLINE") {
-            this.hightOnlineCount++;
-          }
-        });
-      if(this.hightOnlineCount&&this.hightOnlineCount != this.compoundList.length){
+      this.compoundList.forEach((classes) => {
+        if (classes.type == "HIGH") {
+          this.hightCount++;
+        }
+        if (classes.type == "HIGH_ONLINE") {
+          this.hightOnlineCount++;
+        }
+      });
+      if (
+        this.hightOnlineCount &&
+        this.hightOnlineCount != this.compoundList.length
+      ) {
         this.$message.error("线上基础技能班仅能和线上基础技能班合并");
-          this.hightOnlineCount = 0;
-          this.hightCount = 0;
-          this.compoundList = [];
+        this.hightOnlineCount = 0;
+        this.hightCount = 0;
+        this.compoundList = [];
       }
-      if(this.hightCount&&this.hightCount != this.compoundList.length){
-           this.$message.error("基础技能班仅能和基础技能班合并");
-          this.hightOnlineCount = 0;
-          this.hightCount = 0;
-          this.compoundList = [];
+      if (this.hightCount && this.hightCount != this.compoundList.length) {
+        this.$message.error("基础技能班仅能和基础技能班合并");
+        this.hightOnlineCount = 0;
+        this.hightCount = 0;
+        this.compoundList = [];
       }
     },
     isAddCom(row) {