提交开发

1

src/views/resetTeaming/index.vue

@@ -252,7 +252,7 @@ export default {
   },
   async beforeRouteLeave(to, from, next) {
     if (this.activeIndex == 1) {
-      console.log(await this.$refs.teamBaseInfo.setStore('go'))
+      // console.log(await this.$refs.teamBaseInfo.setStore('go'))
       if (await this.$refs.teamBaseInfo.setStore('go')) {
         next();
       }
@@ -319,12 +319,7 @@ export default {
       this.teamid = this.$route.query.id;
     },
     checkGoTo() {
-      //  if (val.name != 1 && this.$refs.teamBaseInfo) {
-      //   await this.$refs.teamBaseInfo.setStore();
-      // }
-         console.log('checkGoTo')
       var p = new Promise(async (resolve, reject) => {
-        console.log(resolve, reject)
         if (this.activeIndex == 1 && this.$refs.teamBaseInfo) {
           if (await this.$refs.teamBaseInfo.setStore('go')) {
             resolve();

src/views/teamDetail/components/studentList.vue

@@ -575,7 +575,7 @@
               <auth :auths="'studentRegistration/batchUpdateSubject'">
                 <el-button
                   type="text"
-                  v-show="scope.row.paymentStatus != 2 && isShowResSound()"
+                  v-show="scope.row.paymentStatus != 2 && isShowResSound()&& scope.row.studentStatus != 'QUIT'"
                   @click="resetSubject(scope.row)"
                   >修改专业</el-button
                 >
@@ -604,7 +604,7 @@
               </auth>
               <auth
                 :auths="'subjectChange/getStudentOriginal'"
-                v-show="scope.row.paymentStatus == 2 && isShowResSound()"
+                v-show="scope.row.paymentStatus == 2 && isShowResSound()&& scope.row.studentStatus != 'QUIT'"
               >
                 <el-button type="text" @click="openChangeVoice(scope.row)"
                   >更改声部</el-button
@@ -1456,7 +1456,7 @@ export default {
       });
 
       // 获取汇总数据
-      this.getTeamStudent();
+      // this.getTeamStudent();
       this.pickerOptions = this.beginDate();
       this.getList();
       // 获取乐团内所有声部
@@ -1586,7 +1586,6 @@ export default {
     search() {
       this.rules.page = 1;
       this.getList();
-      this.getTeamStudent();
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
@@ -1638,6 +1637,7 @@ export default {
           this.getStudentStatus();
         }
       });
+      this.getTeamStudent();
     },
     addPay(row) {
       this.createUserPayVisible = true;