乐团问题修复

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -57,7 +57,7 @@
       v-if="paymentType != 0 && isCommon"
       type="warning">
       <template #title>
-        <p>该乐团为3.0模式，若需创建其他模式的收费标准，请先乐团基本信息的乐团模式
+        <p>该乐团为{{chargeTypeName}}模式，若需创建其他模式的收费标准，请先修改乐团基本信息中的乐团模式
           <strong style="font-weight: 600;margin-left: 10px;cursor: pointer;" @click="$listeners.changeActive({name: '1'})">立即修改>></strong>
       </p>
       </template>
@@ -66,7 +66,7 @@
 </template>
 <script>
 export default {
-  props: ['form', 'isCommon', 'isUserType', 'typeList', 'charges', 'paymentType'],
+  props: ['form', 'isCommon', 'isUserType', 'typeList', 'charges', 'paymentType', 'chargeTypeName'],
   mounted() {
     console.log(this.form)
   },

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

@@ -10,6 +10,7 @@
       @changeActive="$listeners.changeActive"
       :typeList="typeList"
       :charges="charges"
+      :chargeTypeName="chargeTypeName"
       :paymentType="paymentType"
       ref="base"
     />
@@ -111,6 +112,7 @@ export default {
         leixing: "1",
         musicGroupOrganizationCourseSettingId: null,
       },
+      chargeTypeName: '',
       other: {},
       cycles: [{}],
       cycle: {},
@@ -241,6 +243,7 @@ export default {
     },
     async getCharges() {
       const chargeTypeId = this.baseInfo?.musicGroup?.chargeTypeId;
+      this.chargeTypeName = this.baseInfo?.musicGroup?.chargeTypeName;
       try {
         const res = await musicGroupOrganizationCourseSettingsQueryPage({
           row: 9999,

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

@@ -59,7 +59,7 @@
           :key="key"
         >
           <template #title>
-            <p>{{courseTypeListByName[key]}}, 剩余可排课时长{{surplustime[key]}}分钟</p>
+            <p>{{courseTypeListByName[key]}}, 可排课时长{{musicCourseSettings[key]}}分钟</p>
           </template>
           <courseItem
             :surplustime="surplustime[key]"
@@ -122,7 +122,8 @@ export default {
       collapses: [0],
       courseTimes: {},
       courseTypeListByName: {},
-      classTimeListByType
+      classTimeListByType,
+      musicCourseSettings: {}
     };
   },
   watch: {
@@ -176,6 +177,7 @@ export default {
           studentIds,
           classGroupId
         })
+        this.musicCourseSettings = res.data
         const classs = {}
         for (const item of this.courseTypeList) {
           const key = item.value
@@ -211,9 +213,8 @@ export default {
             if (this.form.classs.hasOwnProperty(key)) {
               const item = this.form.classs[key];
               list.push({
-                type: key,
+                type: (this.detail ? undefined : this.activeType),
                 courseType: key,
-                mineType: (this.detail ? undefined : this.activeType),
                 classGroupName: (this.studentSubmitedData?.name || this.detail?.classGroupName),
                 classGroupId: this.detail?.id,
                 musicGroupId: this.musicGroupId,