Merge branch '03/12permission' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/12permission

src/views/teamDetail/components/studentList.vue

@@ -203,9 +203,17 @@
             声部报名计划
           </div>
         </el-popover>
-            <div class="newBand" style="background-color: #f97215; border: 1px solid #f97215;margin-left:15px;" @click="onCreateQRCode('rePayment')">
-            报名链接（无乐器）
-          </div>
+        <div
+          class="newBand"
+          style="
+            background-color: #f97215;
+            border: 1px solid #f97215;
+            margin-left: 15px;
+          "
+          @click="onCreateQRCode('rePayment')"
+        >
+          报名链接（无乐器）
+        </div>
       </div>
     </div>
     <!-- v-if="
@@ -576,7 +584,12 @@
               <auth :auths="'studentRegistration/batchUpdateSubject'">
                 <el-button
                   type="text"
-                  v-show="scope.row.paymentStatus != 2 && isShowResSound()&& scope.row.studentStatus != 'QUIT'"
+                  v-show="
+                    (team_status == 'PAY' || team_status == 'APPLY') &&
+                    scope.row.paymentStatus != 2 &&
+                    isShowResSound() &&
+                    scope.row.studentStatus != 'QUIT'
+                  "
                   @click="resetSubject(scope.row)"
                   >修改专业</el-button
                 >
@@ -605,7 +618,12 @@
               </auth>
               <auth
                 :auths="'subjectChange/getStudentOriginal'"
-                v-show="scope.row.paymentStatus == 2 && isShowResSound()&& scope.row.studentStatus != 'QUIT'"
+                v-show="
+                  (team_status == 'PAY' || team_status == 'APPLY') &&
+                  scope.row.paymentStatus == 2 &&
+                  isShowResSound() &&
+                  scope.row.studentStatus != 'QUIT'
+                "
               >
                 <el-button type="text" @click="openChangeVoice(scope.row)"
                   >更改声部</el-button
@@ -1467,12 +1485,6 @@ export default {
         }
       });
 
-      getintoClass({ musicGroupId: this.teamid }).then((res) => {
-        if (res.code == 200) {
-          this.leftList = res.data;
-        }
-      });
-
       // 获取乐团基本信息
       getMusicGroup({ musicGroupId: this.teamid }).then(
         (res) => (this.baseInfo = res.data)
@@ -1614,7 +1626,12 @@ export default {
       }
     },
     getList() {
-         this.getTeamStudent();
+      getintoClass({ musicGroupId: this.teamid }).then((res) => {
+        if (res.code == 200) {
+          this.leftList = res.data;
+        }
+      });
+      this.getTeamStudent();
       let obj = {
         musicGroupId: this.teamid,
         page: this.rules.page,
@@ -1632,15 +1649,14 @@ export default {
         comeOnPackage: this.searchForm.comeOnPackage,
         carePackage: this.searchForm.carePackage,
       };
-     return getTeamStudentList(obj).then((res) => {
+      return getTeamStudentList(obj).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
           this.getStudentStatus();
-          return res
+          return res;
         }
       });
-
     },
     addPay(row) {
       this.createUserPayVisible = true;
@@ -2242,7 +2258,7 @@ export default {
           if (item.userId === row.userId) {
             this.rowDetail = { ...item, studentId: row.userId };
             this.changeVoiceVisible = true;
-                 console.log( this.rowDetail)
+            console.log(this.rowDetail);
           }
         }
       });