乐团调整

src/views/categroyManager/globalConfig.vue

@@ -36,7 +36,7 @@
         </el-tab-pane>
         <el-tab-pane label="乐团课程费用"
                      name="10"
-                     v-if="permissionList.holidaySetting">
+                     v-if="permissionList.musicCourseFee">
           <musicCourseFee v-if="activeIndex == 10" />
         </el-tab-pane>
         <el-tab-pane label="乐团作业模板"
@@ -111,7 +111,7 @@ export default {
         jobTemplateSetting: permission('/globalConfig/jobTemplateSetting'),
         errorManager: permission('/globalConfig/errorManager'),
         holidaySetting: permission('/globalConfig/holidaySetting'),
-        musicCourseFee:permission('/globalConfig/musicCourseFee')
+        musicCourseFee:permission('/globalConfig/musicCourseFee'),
       }
     }
   },

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -40,7 +40,7 @@
       </el-form>
       <div
         class="newBand"
-        v-permission="'chargeType/upSet'"
+        v-permission="'organizationCourseUnitPriceSettings/insert'"
         @click="newVisiable = true"
       >
         添加
@@ -82,7 +82,7 @@
             <template slot-scope="scope">
               <el-button
                 @click="openTypes(scope.row)"
-                v-permission="'chargeType/upSet'"
+                v-permission="'organizationCourseUnitPriceSettings/update'"
                 type="text"
                 >修改</el-button
               >

src/views/resetTeaming/components/resetPayList.vue

@@ -140,8 +140,10 @@
             <div>
               <el-button type="text"
                          @click="lookDetail(scope.row)"
-                         v-permission="'/strudentPayInfo'">查看</el-button>
+                         v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
+                         v-if="scope.row.status == 'REJECT'"
+                         v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
               <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button>

src/views/resetTeaming/components/resetSoundv2.vue

@@ -21,7 +21,16 @@ export default {
       lookType: ''
     }
   },
+  mounted(){
+    this.init()
+  },
+  activated(){
+     this.init()
+  },
   methods: {
+    init(){
+        this.lookType = this.$route.query.type
+    },
     saveInfo () {
       this.$refs.soundSetCore.submitInfo()
     },

src/views/resetTeaming/modals/review.vue

@@ -12,12 +12,13 @@
     </el-input>
     <div slot="footer" class="dialog-footer">
       <!-- <el-button @click="$listeners.close">取 消</el-button> -->
-      <el-button type="primary" @click="submit(1)">审核通过</el-button>
-      <el-button type="danger" @click="submit(0)">驳回</el-button>
+      <el-button type="primary" @click="submit(1)" v-if="permission('musicGroupPaymentCalender/auditPass')">审核通过</el-button>
+      <el-button type="danger" @click="submit(0)"   v-if="permission('musicGroupPaymentCalender/auditRefuse')">驳回</el-button>
     </div>
   </div>
 </template>
 <script>
+import { permission } from '@/utils/directivePage'
 import Vue from "vue";
 import reviewDetail from "./review-detail";
 import { auditPass, auditRefuse } from "@/api/auditManager";

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -395,7 +395,9 @@ export default {
             obj.musicGroupSubjectGoodsGroups.push(some);
           }
         });
-        if (this.teamStatus == "newTeam") {
+        
+      });
+      if (this.teamStatus == "newTeam") {
           createTeam(obj).then((res) => {
             if (res.code == 200) {
               // 成功 跳转到乐团报名详情
@@ -426,7 +428,6 @@ export default {
             }
           });
         }
-      });
     },
     deleteRow() {
       if (this.checkList.length < 1) {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -679,63 +679,7 @@ export default {
       };
     },
     init () {
-      (this.checkList = {
-        soundInfo: {
-          // 声部
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        allInfo: {
-          // 合奏
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        baseInfo: {
-          // 基础
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        holidayInfo: {
-          // 假期
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        networkInfo: {
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        submit: {
-          ischeck: false,
-          value:
-            "年度安排个月共xxx课时,课时,原价xxx元,现价xxxx元/月(约 xxxx元/课时 )",
-        },
-      }),
-        (this.newStudentList = {
-          baseInfo: {
-            // 基础
-            ischeck: false,
-            value: "",
-            checkBuy: true,
-            nowValue: "",
-            isNew: 1,
-            isStatus: false,
-          },
-        });
+
       this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
@@ -896,7 +840,7 @@ export default {
           ownershipType: "OWN", // 合作机构类型
           feeType: null,
         }),
-          this.$refs["topinfo"].resetFields();
+        this.$refs["topinfo"].resetFields();
       }
       // 1.获取各个选项卡的数据内容
       // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {

src/views/teamBuild/components/teamPayInfo.vue

@@ -2,7 +2,7 @@
   <div class="pay-container">
     <resetPayList :isNewGropu="true" :baseInfo="baseInfo"/>
     <div class="btnWrap">
-      <div class="PrevBtn" @click="goback">上一步</div>
+      <div class="PrevBtn" @click="goback">上一步</div> 
       <!--  v-if="teamStatus != 'teamAudit'" -->
       <div class="submitBtn">预览</div>
   
@@ -24,7 +24,9 @@ export default {
   },
   created() {},
   methods: {
-    goback() {},
+    goback() {
+       this.$emit("chiosetab",1);
+    },
     submitAudit(){
       let teamId =  this.$route.query.id
     }

src/views/teamBuild/components/teamSoundSet.vue

@@ -29,10 +29,10 @@
       >
         提交审核
       </div> -->
-      <div class="submitBtn" @click="approval" v-if="teamStatus == 'teamAudit'">
+      <div class="submitBtn" @click="approval" v-if="teamStatus == 'teamAudit'"  v-permission="{child: 'musicGroup/auditSuccess', parent: '/teamBuild/teamAudit/soundMoney'}">
         审核通过
       </div>
-       <div class="submitBtn" @click="refuse" v-if="teamStatus == 'teamAudit'">
+       <div class="submitBtn" @click="refuse" v-if="teamStatus == 'teamAudit'" v-permission="{child: 'musicGroup/auditFailed', parent: '/teamBuild/teamAudit/soundMoney'}"> 
         驳回
       </div>
     </div>

src/views/teamDetail/teamInfo.vue

@@ -30,7 +30,7 @@
 </template>
 <script>
 import baseInfo from '@/views/teamBuild/components/teamBaseInfo'
-import soundeDetail from '@/views/resetTeaming/components/resetSound'
+import soundeDetail from '@/views/resetTeaming/components/resetSoundv2' 
 export default {
   data () {
     return {

src/views/teamDetail/teamList.vue

@@ -201,7 +201,7 @@
                 <!-- 审核中 编辑 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'AUDIT' && permission('teamDetail/audit/update')"
-                           @click="lookTeamDetail(scope.row)">编辑</el-button>
+                           @click="lookTeamDetail(scope.row)">审核</el-button>
                 <!-- 编辑中 编辑 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'DRAFT' && permission('teamDetail/draft/update')"