Merge branch '01/06_classMerge' into online

src/views/resetTeaming/components/resetPayList.vue

@@ -129,7 +129,7 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT' && scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="teamStatus && scope.row.auditStatus === 'REJECT'"

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -177,7 +177,7 @@
         <div
           class="newBand"
           @click="delStudentBtn"
-          v-if="info.paymentStatus == 'NO'"
+          v-if="info.paymentStatus == 'NO' && titleForm.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
           v-permission="'musicGroupPaymentCalenderDetail/batchDel'"
         >
           删除学员