Quellcode durchsuchen

Merge branch '03/18addSingin' into dev

mo vor 4 Jahren
Ursprung
Commit
59165e2af7
1 geänderte Dateien mit 17 neuen und 10 gelöschten Zeilen
  1. 17 10
      src/views/teamBuild/signupList.vue

+ 17 - 10
src/views/teamBuild/signupList.vue

@@ -197,7 +197,7 @@
         </el-table>
         </el-table>
         <div
         <div
           class="btnWrap"
           class="btnWrap"
-          v-permission="'musicGroup/updateExpectedStudentNum'"
+          v-permission="getFullPermission('musicGroup/updateExpectedStudentNum')"
           style="margin-right: 20px; margin-top: 20px"
           style="margin-right: 20px; margin-top: 20px"
         >
         >
           <el-button v-show="!isEdit" @click="isEdit = true">编辑</el-button>
           <el-button v-show="!isEdit" @click="isEdit = true">编辑</el-button>
@@ -290,26 +290,26 @@
                 </el-popover>
                 </el-popover>
                 <!-- PAY -->
                 <!-- PAY -->
                 <!-- &&  status == "PAY"-->
                 <!-- &&  status == "PAY"-->
-                <auth :auths='getFullPermission("studentRegistration/queryFeeDetail")'>
+                <auth :auths='getFullPermission("studentRegistration/queryFeeDetail")'   v-show="scope.row.paymentStatus == 2">
                   <el-button
                   <el-button
                     type="text"
                     type="text"
-                    v-show="scope.row.paymentStatus == 2"
+
                     @click="lookdetail(scope.row)"
                     @click="lookdetail(scope.row)"
                     >查看</el-button
                     >查看</el-button
                   >
                   >
                 </auth>
                 </auth>
-                <auth :auths='getFullPermission("musicGroupQuit/directQuitMusicGroup2")'>
+                <auth :auths='getFullPermission("musicGroupQuit/directQuitMusicGroup2")'  v-show="scope.row.paymentStatus == 2">
                   <el-button
                   <el-button
                     type="text"
                     type="text"
-                    v-show="scope.row.paymentStatus == 2"
+
                     @click="quitTeam(scope.row)"
                     @click="quitTeam(scope.row)"
                     >退团退费</el-button
                     >退团退费</el-button
                   >
                   >
                 </auth>
                 </auth>
-                <auth :auths='getFullPermission("musicGroupQuit/directQuitMusicGroup3")'>
+                <auth :auths='getFullPermission("musicGroupQuit/directQuitMusicGroup3")'  v-show="scope.row.paymentStatus == 2">
                   <el-button
                   <el-button
                     type="text"
                     type="text"
-                    v-show="scope.row.paymentStatus == 2"
+
                     @click="quieTeams(scope.row)"
                     @click="quieTeams(scope.row)"
                     >退团</el-button
                     >退团</el-button
                   >
                   >
@@ -319,10 +319,10 @@
                     >新增回访</el-button
                     >新增回访</el-button
                   >
                   >
                 </auth>
                 </auth>
-                <auth :auths="getFullPermission('subjectChange/getStudentOriginal')">
+                <auth :auths="getFullPermission('subjectChange/getStudentOriginal')"   v-show="scope.row.paymentStatus == 2">
                   <el-button
                   <el-button
                     type="text"
                     type="text"
-                    v-show="scope.row.paymentStatus == 2"
+
                     @click="openChangeVoice(scope.row)"
                     @click="openChangeVoice(scope.row)"
                     >更改声部</el-button
                     >更改声部</el-button
                   >
                   >
@@ -336,13 +336,14 @@
           v-show="status == 'APPLY'"
           v-show="status == 'APPLY'"
         >
         >
           <el-button @click="onSelectAll">全选/取消</el-button>
           <el-button @click="onSelectAll">全选/取消</el-button>
+          <auth :auths="getFullPermission('studentRegistration/openPayment')">
           <el-button
           <el-button
             style="background-color: #14928a; border: 1px solid #14928a"
             style="background-color: #14928a; border: 1px solid #14928a"
             @click="onPartPayment"
             @click="onPartPayment"
-            v-permission="'studentRegistration/openPayment'"
             type="primary"
             type="primary"
             >提前缴费</el-button
             >提前缴费</el-button
           >
           >
+          </auth>
           <!-- <div class='newBand' v-show="status=='APPLY'">允许缴费</div> -->
           <!-- <div class='newBand' v-show="status=='APPLY'">允许缴费</div> -->
         </div>
         </div>
         <pagination
         <pagination
@@ -1532,6 +1533,12 @@ export default {
 };
 };
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+ .auth {
+    display: inline-block;
+    & + .auth {
+      margin-left: 0px;
+    }
+  }
 .dialog-footer.question {
 .dialog-footer.question {
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;