Merge branch 'master' into 03/12permission

src/views/arrearage-students/modals/list.vue

@@ -146,7 +146,7 @@ export default {
     },
     openCode(row) {
       this.codeStatus = true
-      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id + '&id=' + this.musicGroupId
+      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.musicGroupPaymentCalenderId + '&id=' + this.musicGroupId
     },
     async removeUser() {
       try {

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

@@ -297,13 +297,13 @@
               <p>线上基础技能班规则：</p>
               <p>班级数量：</p>
               <p>
-                乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和（上低音号与长号合并计算）
+                可创建班级数量=各个声部学员数/6向上取整+乐团在读学员数/30向上取整
               </p>
               <p>
-                例：乐团有长笛13人、上低音号8人、长号7人，则该乐团可创建线上基础技能班数量为13/6向上取整+（8+7）/6向上取整=3+3=6个线上基础技能班
+                上低音号、长号学员数合并计算
               </p>
               <p>班级人数：</p>
-              <p>线上基础技能班人数为3至6人</p>
+              <p>线上基础技能班人数上限为6人</p>
             </div>
             <el-button
               type="text"

src/views/teamDetail/components/modals/classroom-setting-merge.vue

@@ -68,7 +68,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         v-if="!!Object.keys(allClasss).length"
         style="display: block"
         label="排课类型"
@@ -82,7 +82,7 @@
           @click="changeTag(key)"
           >{{ courseTypeListByName[key] }}</el-tag
         >
-      </el-form-item>
+      </el-form-item> -->
       <empty v-if="isEmpty" desc="暂无可排课时长" />
       <el-collapse v-model="collapses" @change="collapseChange">
         <el-collapse-item

src/views/teamDetail/components/resetClass.vue

@@ -508,13 +508,13 @@
               <p>线上基础技能班规则：</p>
               <p>班级数量：</p>
               <p>
-                乐团可创建的线上基础技能班数量为各声部人数/6向上取整之和（上低音号与长号合并计算）
+                可创建班级数量=各个声部学员数/6向上取整+乐团在读学员数/30向上取整
               </p>
               <p>
-                例：乐团有长笛13人、上低音号8人、长号7人，则该乐团可创建线上基础技能班数量为13/6向上取整+（8+7）/6向上取整=3+3=6个线上基础技能班
+                上低音号、长号学员数合并计算
               </p>
               <p>班级人数：</p>
-              <p>线上基础技能班人数为3至6人</p>
+              <p>线上基础技能班人数上限为6人</p>
             </div>
             <el-button
               type="text"