Merge branch '0609getMusicFee' into test

src/views/resetTeaming/components/resetPayList.vue

@@ -156,6 +156,7 @@
                   v-if="
                     scope.row.auditStatus != 'REJECT' &&
                     scope.row.auditStatus != 'AUDITING' &&
+                     scope.row.auditStatus != 'DRAFT' &&
                     teamStatus &&
                     scope.row.paymentType != 'MUSIC_APPLY' &&
                     scope.row.paymentType != 'ADD_STUDENT' &&

src/views/resetTeaming/modals/member-setting.vue

@@ -134,7 +134,6 @@ export default {
   },
   async mounted() {
     // 获取所有得会员信息
-    console.log('organId',this.organId)
     try {
       const res = await getAllmemberRank();
       this.memberRankList = res.data;

src/views/resetTeaming/modals/user-pay-form.vue

@@ -86,15 +86,15 @@
         class="alert"
         style="margin-top: 20px"
         type="info"
-        v-if="courseViewType == 1&&paymentType !== undefined"
+        v-if="courseViewType == 1&&paymentType&&paymentType !=2"
       >
       </el-alert>
       <memberSetting
-        v-if="courseViewType == 1&&paymentType !== undefined"
+        v-if="courseViewType == 1&&paymentType&&paymentType !=2"
         :form="memberForm"
         :isUserType="isUserType"
         :organId="baseInfo.musicGroup.organId"
-       :addStudent="addStudent"
+       :addStudent="showMember"
         :showTime="false"
       />
       <el-alert title="缴费设置" :closable="false" class="alert" type="info">
@@ -298,8 +298,8 @@ export default {
     };
   },
   computed: {
-    addStudent(){
-      return this.paymentType == 'ADD_STUDENT'|| this.paymentType ==3
+    showMember(){
+      return  this.paymentType ==3
     },
     musicGroup() {
       return this.baseInfo?.musicGroup;