Merge branch '02/23reviewBUG' into jenkins

src/views/resetTeaming/components/payInfoDetail.vue

@@ -646,6 +646,11 @@ export default {
               this.$set(this.form, "leBaoList", [{ ...res.data.repair }]);
             }
             if (res.data?.course?.length > 0) {
+              this.$set(
+                  this.form,
+                  "calenderFeeType",
+                  res.data?.calender?.calenderFeeType
+                );
               this.$nextTick(() => {
                 this.teamCourse = true;
 
@@ -657,11 +662,7 @@ export default {
                   "payUserType",
                   res.data?.calender?.payUserType
                 );
-                this.$set(
-                  this.form,
-                  "calenderFeeType",
-                  res.data?.calender?.calenderFeeType
-                );
+
                 this.$set(
                   this.form,
                   "musicGroupCalenderRefundPeriods",
@@ -1266,29 +1267,29 @@ export default {
       },
       deep: true,
     },
-    "form.calenderFeeType"(val, oldValue) {
-      if (val == "TEACHER" && !oldValue) {
-        let arr = [];
-        this.form.eclass.forEach((item) => {
-          arr.push({
-            courseType: item.courseType,
-            teacherNumber: 0,
-            courseNumber: 0,
-            courseCurrentPrice: 0,
-          });
-        });
+    // "form.calenderFeeType"(val, oldValue) {
+    //   if (val == "TEACHER" && !oldValue) {
+    //     let arr = [];
+    //     this.form.eclass.forEach((item) => {
+    //       arr.push({
+    //         courseType: item.courseType,
+    //         teacherNumber: 0,
+    //         courseNumber: 0,
+    //         courseCurrentPrice: 0,
+    //       });
+    //     });
 
-        this.$set(this.form, "teacherFeeList", arr);
-      }
-    },
+    //     this.$set(this.form, "teacherFeeList", arr);
+    //   }
+    // },
 
     "form.currentTotalAmount"(val) {
       // console.log(val,'form.currentTotalAmount');
       // this.$forceUpdate()
     },
     "form.calenderFeeType"(val,oldValue) {
-
-      if (val == "TEACHER"&&!oldValue) {
+      console.log(val,oldValue,this.initDetail)
+      if (val == "TEACHER"&&!this.initDetail ) {
         let arr = [];
         this.form.eclass.forEach((item) => {
           arr.push({

src/views/resetTeaming/components/resetPayList.vue

@@ -201,7 +201,7 @@
               <auth
                 auths="musicGroupPaymentCalender/update/4313"
                 v-if="
-                  teamStatus &&  scope.row.paymentType != 'ADD_STUDENT' &&
+                  teamStatus &&
                   (scope.row.status === 'REJECT' ||
                     scope.row.status === 'DRAFT')
                 "