提交测试

1

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -469,8 +469,9 @@ import reviewDetail from "../modals/review-detail";
 import { userPaymentType } from "@/constant";
 import { objectToOptions } from "@/utils";
 import { payOrderTypeList } from "@/utils/searchArray";
+import { getTeamBaseInfo } from "@/api/buildTeam";
 export default {
-  props: ["baseInfo", "isNewGropu"],
+  props: [ "isNewGropu"],
   components: {
     pagination,
     setStudentFee,
@@ -536,6 +537,7 @@ export default {
       musicGroupPaymentCalenderId: "",
       payOrderTypeLists: payOrderTypeList,
       getMoneyVisible: false,
+      baseInfo:null
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -579,6 +581,11 @@ export default {
           musicGroupId: this.$route.query.id,
         });
       } catch (error) {}
+           getTeamBaseInfo({ musicGroupId: this.$route.query.id }).then((res) => {
+        if (res.code == 200) {
+          this.baseInfo = res.data;
+        }
+      });
       this.getList();
     },
     newUserPay() {

src/views/resetTeaming/index.vue

@@ -127,8 +127,7 @@
           :disabled="!teamid"
         >
           <resetPayList
-            :baseInfo="baseInfo"
-            v-if="activeIndex == '3' && baseInfo"
+            v-if="activeIndex == '3' "
             @changeActive="handleClick"
           />
         </el-tab-pane>
@@ -140,8 +139,7 @@
           :disabled="!teamid"
         >
           <resetPayListSchool
-            :baseInfo="baseInfo"
-            v-if="activeIndex == '6' && baseInfo"
+            v-if="activeIndex == '6'"
             @changeActive="handleClick"
           />
         </el-tab-pane>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -333,13 +333,13 @@
           修改
         </div> -->
         <!-- 审批或者草稿的下一步 -->
-        <div class="nextBtn" @click="gotoNext" v-if="!basdisabled">
+        <div class="nextBtn" @click="gotoNext()" v-if="!basdisabled">
           {{ this.teamStatus == "teamDraft" ? "下一步" : "保存" }}
         </div>
         <div
           class="nextBtn"
           v-if="this.teamStatus == 'teamAudit'"
-          @click="gotoNext"
+          @click="gotoNext()"
         >
           下一步
         </div>
@@ -730,6 +730,7 @@ export default {
             this.$emit("handleClick", { name: "2" });
           } else {
                this.$emit("getName", this.topFrom.name);
+               console.log(str)
                tempStatus = await this.resetSubmit(str);
 
           }

src/views/teamBuild/modals/change-voice.vue

@@ -289,7 +289,7 @@ export default {
       return ''
     },
     filterVoiceList() {
-      return this.voiceList.filter(item => item.subjectId !== this.detail.actualSubjectId)
+      return this.voiceList.filter(item => item.subjectId != this.detail.subjectId)
     },
     activeAccessories() {
       const { musicalGoods } = this.form || {}

src/views/teamDetail/components/studentList.vue

@@ -2236,7 +2236,7 @@ export default {
       // this.getList().then((res) => {
       //   for (const item of res.data.rows) {
       //     if (item.id === row.id) {
-      //       this.rowDetail = { ...item };
+      //       this.rowDetail = { ...item, studentId: row.userId };
       //       this.changeVoiceVisible = true;
       //            console.log( this.rowDetail)
       //     }