Merge branch '08/24teamQuest' into jenkins

src/views/resetTeaming/components/payInfoDetail.vue

@@ -588,7 +588,7 @@ export default {
               this.form.musicGroupOrganizationCourseSettingId =
                 res.data?.calender?.musicGroupOrganizationCourseSettingId;
             } else {
-              this.form.leixing = "1";
+              this.form.leixing = "2";
             }
             console.log( res.data?.calender?.startPaymentDate)
             if(res.data?.calender?.startPaymentDate&& res.data?.calender?.deadlinePaymentDate){

src/views/resetTeaming/components/resetPayList.vue

@@ -758,7 +758,7 @@ export default {
     },
     teamStatus() {
       // let type = this.$route.query.type;
-      return this.team_status == "DRAFT" || this.team_status == "PROGRESS";
+      return this.team_status == "DRAFT" || this.team_status == "PROGRESS" ;
     },
     team_status() {
       return this.$route.query.team_status;

src/views/resetTeaming/modals/paySchoolInfo.vue

@@ -21,7 +21,7 @@
       </el-form-item> -->
     </p>
     <div class="infoWrap">
-      <el-form-item
+      <!-- <el-form-item
         label="计价标准"
         class="vertical"
         prop="isShowMusicInsuranceForPay"
@@ -31,7 +31,7 @@
           <el-option label="按老师" value="TEACHER" :disabled="!teamCourse">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item
         v-if="form.calenderFeeType == 'STUDENT'"
@@ -267,6 +267,9 @@
           >
           </el-date-picker>
         </el-form-item>
+
+      </el-row>
+      <el-row>
         <el-form-item
           label="上传合同"
           prop="contractUrl"
@@ -287,7 +290,6 @@
           />
         </el-form-item>
       </el-row>
-
       <el-row>
         <el-col class="memoWrap">
           <el-form-item