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

src/api/buildTeam.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 import request2 from '@/utils/request2'
 import qs from 'qs'
 let api = '/api-web'
-// 获取分部
-export function getSection (data) {
-  return request({
-    url: api + '/organization/queryPage',
-    method: 'get',
-    params: data
-  })
-}
+// // 获取分部
+// export function getSection (data) {
+//   return request({
+//     url: api + '/organization/queryPage',
+//     method: 'get',
+//     params: data
+//   })
+// }
 // 获取收费类型
 export function getType (data) {
   return request({

src/views/resetTeaming/components/resetPayList.vue

@@ -364,20 +364,17 @@
   </div>
 </template>
 <script>
-import axios from "axios";
-import { getToken } from "@/utils/auth";
+
 import pagination from "@/components/Pagination/index";
-import load from "@/utils/loading";
-import qs from "qs";
 import dayjs from 'dayjs'
 import QrCode from "@/components/QrCode/index";
 import { vaildStudentUrl } from '@/utils/validate'
-import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender, findMusicGroupSubjectInfo } from "@/api/buildTeam";
+import {  resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender, findMusicGroupSubjectInfo } from "@/api/buildTeam";
 import { getAuditList } from '@/api/auditManager'
 import {
   getOrganizationCourseUnitPriceSettings
 } from '@/api/specialSetting'
-import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd, musicGroupPaymentCalenderDelByBatchNo } from '../api'
+import {  getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd, musicGroupPaymentCalenderDelByBatchNo } from '../api'
 import setStudentFee from './studentPayBase'
 import userPayForm from '../modals/user-pay-form'
 import payItems from '../modals/pay-items'

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -380,26 +380,21 @@
   </div>
 </template>
 <script>
-import axios from "axios";
-import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
-import load from "@/utils/loading";
-import qs from "qs";
 import dayjs from 'dayjs'
 import QrCode from "@/components/QrCode/index";
 import { vaildStudentUrl } from '@/utils/validate'
 import {
-  addMusicGroupPaymentCalender,
-  getMusicGroupPaymentCalender,
+
   resetMusicGroupPaymentCalender,
   delMusicGroupPaymentCalender,
-  getmusicGroupPaymentCalenderDetail
+
 } from "@/api/buildTeam";
 import {
   getOrganizationCourseUnitPriceSettings
 } from '@/api/specialSetting'
 import { getAuditList } from '@/api/auditManager'
-import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd, musicGroupPaymentCalenderDelByBatchNo } from '../api'
+import {  getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd, musicGroupPaymentCalenderDelByBatchNo } from '../api'
 import setStudentFee from './studentPayBase'
 import userPayForm from '../modals/user-pay-form'
 import payItems from '../modals/pay-items'

src/views/resetTeaming/components/studentPayBase.vue

@@ -126,7 +126,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
-import { findSound, getMusicGroupStudentFee, resetMusicGroupStudentFee, queryCanAddStudent } from "@/api/buildTeam";
+import { findSound, resetMusicGroupStudentFee, queryCanAddStudent } from "@/api/buildTeam";
 
 export default {
   components: { pagination },

src/views/resetTeaming/index.vue

@@ -19,11 +19,12 @@
         <el-tab-pane
           label="基本信息"
           lazy
-          v-if="permission('/resetTeaming/teamBaseInfo')"
+          v-if="permission('/teamBaseInfo')"
           name="1"
         >
+        <!--  v-if="activeIndex == 'teamBaseInfo'" -->
           <teamBaseInfo
-            v-if="activeIndex == 'teamBaseInfo'"
+          v-if="activeIndex == '1'"
             @getBaseInfo="getBaseInfo"
             :baseInfo="baseInfo"
             @getName="getName"
@@ -33,13 +34,13 @@
         <el-tab-pane
           label="声部设置"
           lazy
-          v-if="permission('/resetTeaming/resetSound')"
+          v-if="permission('/teamSoundMoney')"
           name="2"
           :disabled="!teamid"
         >
-          <resetSound v-if="activeIndex == 'resetSound'" />
+          <resetSound v-if="activeIndex == '2'" />
         </el-tab-pane>
-        <el-tab-pane lazy label="预报名信息" name="9" :disabled="!teamid">
+        <el-tab-pane lazy label="预报名信息" name="9" :disabled="!teamid" v-if="permission('/teamForecastName')">
           <!--         v-if="
             team_status == 'PRE_APPLY' ||
             team_status == 'PRE_BUILD_FEE' ||
@@ -60,7 +61,7 @@
           name="4"
           :disabled="!teamid"
         >
-          <teacherList :teamid="teamid" v-if="activeIndex == 'teacherList'" />
+          <teacherList :teamid="teamid" v-if="activeIndex == '4'" />
         </el-tab-pane>
         <el-tab-pane
           label="学生列表"
@@ -68,7 +69,7 @@
           name="7"
           :disabled="!teamid"
         >
-          <studentList :teamid="teamid" v-if="activeIndex == 'studentList'" />
+          <studentList :teamid="teamid" v-if="activeIndex == '7'" />
         </el-tab-pane>
 
         <el-tab-pane
@@ -79,7 +80,7 @@
           :disabled="!teamid"
         >
           <resetClass
-            v-if="activeIndex == 'resetClass' && musicGroupInfo"
+            v-if="activeIndex == '5' && musicGroupInfo"
             :musicGroupInfo="musicGroupInfo"
           />
         </el-tab-pane>
@@ -95,26 +96,26 @@
         <el-tab-pane
           label="学员缴费设置"
           lazy
-          v-if="permission('/resetTeaming/resetPayList')"
+          v-if="permission('/teamStudentPayList')"
           name="3"
           :disabled="!teamid"
         >
           <resetPayList
             :baseInfo="baseInfo"
-            v-if="activeIndex == 'resetPayList' && baseInfo"
+            v-if="activeIndex == '3' && baseInfo"
             @changeActive="handleClick"
           />
         </el-tab-pane>
         <el-tab-pane
           label="学校缴费设置"
           lazy
-          v-if="permission('/resetTeaming/resetPayList')"
+          v-if="permission('/teamSchoolPayList')"
           name="6"
           :disabled="!teamid"
         >
           <resetPayListSchool
             :baseInfo="baseInfo"
-            v-if="activeIndex == 'resetPayList' && baseInfo"
+            v-if="activeIndex == '6' && baseInfo"
             @changeActive="handleClick"
           />
         </el-tab-pane>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -374,7 +374,6 @@ import { findTechnician } from "@/api/repairManager";
 import dayjs from "dayjs";
 import merge from "webpack-merge";
 import {
-  queryEmployByOrganId,
   queryByOrganId,
   getSchool,
 } from "@/api/systemManage";

src/views/teamDetail/components/studentList.vue

@@ -517,7 +517,7 @@
               <el-button
                 type="text"
                 v-if="
-                  permission('musicGroupQuit/directQuitMusicGroup') &&
+                  permission('musicGroupQuit/directQuitMusicGroup2') &&
                   scope.row.studentStatus != 'QUIT'
                 "
                 @click="quieTeamMask(scope.row)"
@@ -526,7 +526,7 @@
               <el-button
                 type="text"
                 v-if="
-                  permission('musicGroupQuit/directQuitMusicGroup1') &&
+                  permission('musicGroupQuit/directQuitMusicGroup3') &&
                   scope.row.studentStatus != 'QUIT'
                 "
                 @click="quieTeam(scope.row)"
@@ -535,7 +535,7 @@
 
               <el-button
                 type="text"
-                v-if="permission('visit/add')"
+                v-if="permission('visit/add/teamStudentList')"
                 @click="addVisit(scope.row)"
                 >新增回访</el-button
               >
@@ -1066,12 +1066,10 @@
 import {
   getTeamStudentList,
   getTeamStudentInfo,
-  getSingleClass,
   findSound,
   StudentQuit,
   findSubjectPlan,
   getGoods,
-  getSubject,
   getMusicGroup,
   getMusicGroupAllClass,
   StudentFeeIsLock,
@@ -1082,7 +1080,6 @@ import {
   extensionPayment,
   extensionApplyExpire,
   getTeamBaseInfo,
-  findUserByRole,
   getintoClass,
   resetPlanNum,
 
@@ -1108,6 +1105,7 @@ import cleanDeep from "clean-deep";
 import createUserPay from "./modals/create-user-pay.vue";
 import TimesView from "./modals/course-time-detail";
 import paymentCycle from "../../resetTeaming/modals/payment-cycle";
+
 import paymentList from "./modals/payment-list";
 import Tooltip from "@/components/Tooltip/index";
 import changeVoice from "@/views/teamBuild/modals/change-voice";