提交一下

1

src/views/resetTeaming/components/payInfoDetail.vue

@@ -897,7 +897,6 @@ export default {
           }
         });
       }
-
       return {
         payUserType: this.$route.query.payUserType,
         musicGroup: this.musicGroup,
@@ -907,7 +906,7 @@ export default {
           member: memberObj, // 云教练
           memberPrivilegesItemList: [], // 会员基本内容
           repair:
-            form.leBaoList?.length > 0
+            (form.leBaoList?.length > 0&&this.isShowLeBao&&this.$route.query.team_status != 'PROGRESS')
               ? { ...form.leBaoList[0], optionalFlag: false }
               : null, // 乐保
         },
@@ -918,34 +917,6 @@ export default {
       };
     },
     fommatDate() {
-      console.log({
-        payUserType: this.$route.query.payUserType,
-        musicGroupOrganizationCourseSettingId:
-          this.form.musicGroupOrganizationCourseSettingId || null,
-        memo: this.form.memo,
-        startPaymentDate: this.form.paymentDate[0],
-        deadlinePaymentDate: this.form.paymentDate[1],
-        calenderActivityList:
-          this.form.activeList?.length > 0 ? this.form.activeList : null,
-        musicRepair:
-          this.form.leBaoList?.length > 0
-            ? { ...this.form.leBaoList[0] }
-            : null,
-        calenderMember:
-          this.form.memberList?.length > 0 &&
-          this.form.memberList[0]?.memberRankSettingId
-            ? { ...this.form.memberList[0] }
-            : null,
-        musicGroupPaymentCalenderCourseSettingsList:
-          this.form.eclass?.length > 0 ? this.form.eclass : null,
-        musicGroupId: this.$route.query.id,
-        paymentItemShowState: {
-          isShowMemberForPay: this.form.isShowMemberForPay,
-          isShowMusicInsuranceForPay: this.form.isShowMusicInsuranceForPay,
-          isShowVipCourseForPay: this.form.isShowVipCourseForPay,
-          isShowMusicCourseForPay: this.form.isShowMusicCourseForPay,
-        },
-      })
       return {
         payUserType: this.$route.query.payUserType,
         musicGroupOrganizationCourseSettingId:

src/views/resetTeaming/modals/subject-preview.vue

@@ -246,6 +246,7 @@ export default {
           ).format("YYYY/MM/DD");
       }
       const paymentCalender =  this.mypreViewData&&this.mypreViewData.paymentCalender ? this.mypreViewData.paymentCalender : (tempResult.paymentCalender || null)
+      console.log(paymentCalender,'paymentCalender')
       if(paymentCalender&&paymentCalender.calender&&paymentCalender.calender.paymentItemShowState){
 
         let obj = JSON.parse(paymentCalender.calender.paymentItemShowState)
@@ -272,13 +273,16 @@ export default {
       });
       // 云教练
       const member = paymentCalender && paymentCalender.member ? paymentCalender.member : {}
+
       member.isStatus = true
-      this.toolsPackage = member.actualAmount ? [member] : [member]
+
+      this.toolsPackage = (member&&!member.memberRankSettingId)? [] : [member]
+
       // 乐器保养
       const repair = paymentCalender && paymentCalender.repair ? paymentCalender.repair : {}
       repair.name = '乐器保养'
       repair.isStatus = true // 默认不选择乐器保养
-      this.instrumentRepair = repair.actualAmount ? [repair] : [repair]
+      this.instrumentRepair = repair.actualAmount+'' ? [] : [repair]
       // 小班课
       const activity = paymentCalender && paymentCalender.activity ? paymentCalender.activity : []
       activity.map(i => {