提交测试

1

src/views/resetTeaming/components/resetPayList.vue

@@ -33,7 +33,7 @@
         class="newBand"
         @click="newUserPay"
         v-if="teamStatus"
-        v-permission="'musicGroupPaymentCalender/add'"
+        v-permission="'musicGroupPaymentCalender/add/3895'"
       >
         新建学员缴费
       </div>
@@ -136,7 +136,7 @@
               <el-button
                 type="text"
                 @click="lookList(scope.row)"
-                v-permission="'musicGroupPaymentCalender/queryPage'"
+                v-permission="'musicGroupPaymentCalender/queryPage/4315'"
                 >查看</el-button
               >
               <!-- <el-button type="text"
@@ -153,20 +153,20 @@
                   scope.row.paymentType != 'ADD_STUDENT' &&
                   scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
                 "
-                v-permission="'musicGroupPaymentCalenderDetail/batchAdd'"
+                v-permission="'musicGroupPaymentCalenderDetail/batchAdd/3890'"
                 >添加学员</el-button
               >
               <el-button
                 type="text"
                 v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
-                v-permission="'musicGroupPaymentCalender/update'"
+                v-permission="'musicGroupPaymentCalender/update/4313'"
                 @click="resetPay(scope.row)"
                 >修改</el-button
               >
 
               <el-button
                 type="text"
-                v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                v-permission="'musicGroupPaymentCalender/delByBatchNo/4305'"
                 v-if="
                   (scope.row.auditStatus == 'REJECT' ||
                     scope.row.auditStatus == 'AUDITING' ||
@@ -422,6 +422,7 @@
       title="报名声部预览"
       :visible.sync="dialogSubjectVisible"
       width="400px"
+      class="subjectPreview"
     >
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane
@@ -437,9 +438,9 @@
           ></subject-preview>
         </el-tab-pane>
       </el-tabs>
-      <div slot="footer">
+      <!-- <div slot="footer">
         <el-button @click="dialogSubjectVisible = false">取 消</el-button>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -905,4 +906,10 @@ export default {
     padding: 0;
   }
 }
+
+.subjectPreview {
+  /deep/.el-dialog__body {
+    padding: 30px 0 0;
+  }
+}
 </style>

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -33,7 +33,7 @@
         class="newBand"
         @click="newSchoolPay"
         v-if="teamStatus"
-        v-permission="'musicGroupPaymentCalender/add'"
+        v-permission="'musicGroupPaymentCalender/add/4359'"
       >
         新建学校缴费
       </div>
@@ -140,7 +140,7 @@
               <el-button
                 type="text"
                 @click="lookList(scope.row)"
-                v-permission="'musicGroupPaymentCalender/queryPage'"
+                v-permission="'musicGroupPaymentCalender/queryPage/3881'"
                 >查看</el-button
               >
               <!-- <el-button type="text"
@@ -156,20 +156,20 @@
                   scope.row.paymentType != 'MUSIC_APPLY' &&
                   scope.row.paymentType != 'ADD_STUDENT'
                 "
-                v-permission="'musicGroupPaymentCalenderDetail/batchAdd'"
+                v-permission="'musicGroupPaymentCalenderDetail/batchAdd/4360'"
                 >添加学员</el-button
               >
               <el-button
                 type="text"
                 v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
-                v-permission="'musicGroupPaymentCalender/update'"
+                v-permission="'musicGroupPaymentCalender/update/3883'"
                 @click="resetPay(scope.row)"
                 >修改</el-button
               >
 
               <el-button
                 type="text"
-                v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                v-permission="'musicGroupPaymentCalender/delByBatchNo/3925'"
                 v-if="
                   (scope.row.auditStatus == 'REJECT' ||
                     scope.row.auditStatus == 'AUDITING' ||

src/views/resetTeaming/modals/pay-items.vue

@@ -9,9 +9,15 @@
         prop="id"
         width="120"
         label="缴费单号"
-         :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
+        :rules="[
+          {
+            pattern: /^[0-9]*$/,
+            message: '请输入正确的缴费单号',
+            trigger: 'blur',
+          },
+        ]"
       >
-      <template slot-scope="scope">
+        <template slot-scope="scope">
           <div>
             <copy-text>{{ scope.row.id }}</copy-text>
           </div>
@@ -23,7 +29,7 @@
         width="200"
         label="缴费批次"
       >
-      <template slot-scope="scope">
+        <template slot-scope="scope">
           <div>
             <copy-text>{{ scope.row.batchNo }}</copy-text>
           </div>
@@ -36,7 +42,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="status" width="120" label="缴费状态">
+      <el-table-column
+        align="center"
+        prop="status"
+        width="120"
+        label="缴费状态"
+      >
         <template slot-scope="scope">
           <div>
             {{ scope.row.status | payTypeStatus }}
@@ -73,7 +84,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="memo" label="备注" width="200" class-name="table-btns">
+      <el-table-column
+        align="center"
+        prop="memo"
+        label="备注"
+        width="200"
+        class-name="table-btns"
+      >
         <template slot-scope="scope">
           <overflow-text :text="scope.row.memo"></overflow-text>
         </template>
@@ -82,9 +99,17 @@
         <template slot-scope="scope">
           <div>
             <el-button
+              v-if="payUserType === 'STUDENT'"
               type="text"
               @click="toDetail(scope.row)"
-              v-permission="'musicGroupPaymentCalender/auditListDetail'"
+              v-permission="'/strudentPayInfo'"
+              >查看</el-button
+            >
+            <el-button
+              v-else
+              type="text"
+              @click="toDetail(scope.row)"
+              v-permission="'musicGroupPaymentCalender/auditListDetail/3882'"
               >查看</el-button
             >
             <!-- <el-button
@@ -107,10 +132,13 @@
               @click="$listeners.resetPay(scope.row)"
               >修改</el-button
             > -->
-            <el-button type="text"
-                        v-if="$listeners.lookUserList"
-                        @click="$listeners.lookUserList(scope.row)"
-                        v-permission="'musicGroupPaymentCalender/queryPage'">学员列表</el-button>
+            <el-button
+              type="text"
+              v-if="$listeners.lookUserList"
+              @click="$listeners.lookUserList(scope.row)"
+              v-permission="'musicGroupPaymentCalender/queryPage'"
+              >学员列表</el-button
+            >
             <el-button
               type="text"
               v-permission="'musicGroupPaymentCalender/makesureSchoolePaid'"
@@ -132,7 +160,13 @@
             <!-- studentRegistration/getSubjectGoodsAndInfo/967 -->
             <el-button
               type="text"
-              v-if="$listeners.onPreview && payUserType === 'STUDENT' && scope.row.paymentType == 'MUSIC_APPLY' && (permission('musicGroup/findMusicGroupSubjectInfo/966') &&permission('studentRegistration/getSubjectGoodsAndInfo/967'))"
+              v-if="
+                $listeners.onPreview &&
+                payUserType === 'STUDENT' &&
+                scope.row.paymentType == 'MUSIC_APPLY' &&
+                permission('musicGroup/findMusicGroupSubjectInfo/966') &&
+                permission('studentRegistration/getSubjectGoodsAndInfo/967')
+              "
               @click="$listeners.onPreview(scope.row)"
               >预览</el-button
             >
@@ -154,11 +188,17 @@
   </div>
 </template>
 <script>
-import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender, findMusicGroupSubjectInfo } from "@/api/buildTeam";
-import { musicGroupPaymentCalenderDetailDel } from '../api'
-import loading from '@/utils/loading'
+import {
+  addMusicGroupPaymentCalender,
+  getMusicGroupPaymentCalender,
+  resetMusicGroupPaymentCalender,
+  delMusicGroupPaymentCalender,
+  findMusicGroupSubjectInfo,
+} from "@/api/buildTeam";
+import { musicGroupPaymentCalenderDetailDel } from "../api";
+import loading from "@/utils/loading";
 import pagination from "@/components/Pagination/index";
-import { permission } from '@/utils/directivePage'
+import { permission } from "@/utils/directivePage";
 export default {
   props: ["batchNo", "teamStatus", "teamType", "payUserType", "isNewGropu"],
   components: {
@@ -192,14 +232,14 @@ export default {
       } catch (error) {}
     },
     toDetail(row) {
-      if (this.payUserType === 'STUDENT') {
+      if (this.payUserType === "STUDENT") {
         this.$listeners.close();
       }
       this.$nextTick(() => {
-          this.$listeners.lookDetail(row)
-      })
+        this.$listeners.lookDetail(row);
+      });
     },
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/teamDetail/components/resetClass.vue

@@ -170,13 +170,13 @@
             </div>
           </div>
           <div class="right"  v-if="team_status == 'PREPARE'||team_status == 'PROGRESS'">
-            <div class="add" @click="temporary">新建临时班</div>
-            <div class="add" @click="addNewClass('NORMAL')">新建声部班</div>
-            <div class="add" @click="addNewClass('MIX')">新建合奏班</div>
-            <div class="add" @click="addNewClass('MUSIC_NETWORK')">
+            <div class="add" v-if="permission('classGroup/create')" @click="temporary">新建临时班</div>
+            <div class="add" v-if="permission('classGroup/create')" @click="addNewClass('NORMAL')">新建声部班</div>
+            <div class="add" v-if="permission('classGroup/create')" @click="addNewClass('MIX')">新建合奏班</div>
+            <div class="add" v-if="permission('classGroup/revisionAddClassGroup')"   @click="addNewClass('MUSIC_NETWORK')">
               新建乐团网管课
             </div>
-            <div class="add" @click="newClassVisible = true">基础技能班</div>
+            <div class="add" v-if="permission('classGroup/create')" @click="newClassVisible = true">基础技能班</div>
           </div>
 
           <!-- <div class="add"