Merge branch '08/24teamQuest' into 11/24SAAS

src/views/resetTeaming/components/payInfoDetail.vue

@@ -448,7 +448,7 @@ export default {
       form: {
         paymentType: "",
         memo: "",
-        eclass: [],
+        eclass: [{}],
         memberList: [
           {
             period: "",
@@ -460,8 +460,8 @@ export default {
             autoActivationFlag: false,
           },
         ],
-        leBaoList: [],
-        activeList: [],
+        leBaoList: [{}],
+        activeList: [{}],
         teacherFeeList: [],
         isShowMemberForPay: true,
         isShowMusicInsuranceForPay: true,
@@ -682,6 +682,21 @@ export default {
                   }
                 }
               });
+            }else{
+              this.$set(
+                  this.form,
+                  "calenderFeeType",
+                  res.data?.calender?.calenderFeeType
+                );
+                this.$set(
+                  this.form,
+                  "musicGroupCalenderRefundPeriods",
+                  res.data?.calenderRefundPeriods
+                );
+              let calenderFeeJson = res.data?.calender?.calenderFeeJson;
+                if (calenderFeeJson) {
+                  calenderFeeJson = JSON.parse(calenderFeeJson);
+                  this.$set(this.form, "calenderFeeJson", calenderFeeJson);}
             }
             if (res.data?.activity?.length > 0) {
               this.teamActive = true;

src/views/resetTeaming/modals/paySchoolInfo.vue

@@ -374,6 +374,7 @@ export default {
   },
   computed: {
     allTotal() {
+      console.log(this.form.calenderFeeJson.sutdentNumber)
       let num = 0;
       if (this.form.calenderFeeType == "STUDENT") {
         if (this.teamCourse) {