运营管理完成

1

src/constant/index.js

@@ -251,6 +251,12 @@ export const ProbationPeriodStatus = {
   3: '实习'
 }
 
+
+export const clientType = {
+  STUDENT:'学生端',
+  TEACHER:'老师端',
+
+}
 // export const musicScoreCategoriesId = [
 //   ''
 // ]

src/router/index.js

@@ -75,7 +75,7 @@ export const constantRoutes = [
     //     noCache: '1',
     //     title: '侧边栏'
     //   }
-    // }, 
+    // },
     {
       name: '提交表单',
       path: 'save-form',
@@ -428,6 +428,8 @@ export const asyncRoutes = {
   branchActiveManager:()=>import('@/views/courseListManager'),
   // vip活动管理
   vipActiveManager:()=>import('@/views/courseListManager'),
+  // 乐团缴费
+  teamPayInfo:()=>import('@/views/courseListManager'),
   serverDetail:()=>import('@/views/serverDetail'),
   // 未在班级学员
   notClassStudent:()=>import('@/views/main/notClassStudent')

src/utils/vueFilter.js

@@ -186,7 +186,7 @@ Vue.filter('userPaymentTypeFormat', val => constant.userPaymentType[val])
 Vue.filter('courseTypeFormat', val => constant.courseType[val])
 // 格式化签到签退记录 updateAttendanceEnum
 Vue.filter('updateAttendanceEnum', val => constant.updateAttendanceEnum[val])
-
+Vue.filter('clientTypeFilter',val=>constant.clientType[val])
 // 时间处理
 Vue.filter('timer', (value) => {
   if (value) {

src/views/accompanyManager/accompanyList.vue

@@ -572,7 +572,7 @@ export default {
     let coursesStartDate = this.$helpers.dayjs(row.coursesStartDate).format('YYYY-MM-DD')
     let coursesExpireDate = this.$helpers.dayjs(row.coursesExpireDate).format('YYYY-MM-DD')
       this.$router.push({
-        path: "/business/accompanys",
+        path: "/accompanys",
         query: { id: row.id, type: row.type,coursesStartDate,coursesExpireDate },
       });
     },

src/views/accompanyManager/accompanys.vue

@@ -1049,7 +1049,7 @@ export default {
     goBack() {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
-        path: "/business/accompany",
+        path: "/accompanyManager/accompany",
       });
     },
     teacherClose() {

src/views/afterSchoolManager/afterSchoolDetail.vue

@@ -31,7 +31,7 @@ export default {
     },
     goBack () {
       this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: "/business/workManager/afterSchoolManager"});
+      this.$router.push({ path: "/afterSchoolManager"});
     }
   }
 };

src/views/afterSchoolManager/afterSchoolList.vue

@@ -277,7 +277,7 @@ export default {
     },
     lookDetail(row) {
       this.$router.push({
-        path: "/business/workManager/afterSchoolDetail",
+        path: "/afterSchoolDetail",
         query: { extracurricularExercisesId: row.id, title: row.title },
       });
     },

src/views/app/suggestion.vue

@@ -40,7 +40,14 @@
           </el-table-column>
           <el-table-column align="center"
                            label="客户端"
-                           prop="clientType"></el-table-column>
+                           prop="clientType">
+                           <template slot-scope="scope">
+                             <div>
+                               {{scope.row.clientType|clientTypeFilter}}
+                             </div>
+                           </template>
+
+                           </el-table-column>
           <!-- <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">

src/views/attendanceManager/attendanceList/index.vue

@@ -129,7 +129,7 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <auth auths='/attenddanceDetail'>
+                <auth auths='/teamCourseListDetailWorkList/attendanceList'>
                   <el-button
                   type="text"
                   @click="lookDetail(scope.row)"

src/views/categroyManager/insideSetting/branchActive.vue

@@ -187,7 +187,7 @@ export default {
     },
     openActive(type, row) {
       let params = {
-        path: "/vipClassSet/branchActiveOperation",
+        path: "/branchActiveOperationAdd",
         query: {
           type: type,
         },
@@ -196,6 +196,7 @@ export default {
       if (row) {
         params.query.id = row.id;
         tagTitle = "修改";
+        params.path='/branchActiveOperation'
       }
       this.$router.push(params, (route) => {
         route.meta.title = tagTitle + "VIP分部活动";

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -299,14 +299,14 @@ export default {
       if (res.code == 200) {
         this.$message.success('修改成功')
         this.$store.dispatch('delVisitedViews', this.$route)
-        this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
+        this.$router.push({ path: '/operateManager/branchActiveManager/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
       } else {
         this.$message.error(res.msg)
       }
     },
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/vipClassSet/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
+      this.$router.push({ path: '/operateManager/branchActiveManager/branchActive', query: { rules: this.pageInfo, searchForm: this.searchForm } })
     },
     resetForm () {
       this.teacherList = []
@@ -445,4 +445,4 @@ export default {
   text-align: center;
   margin-right: 10px;
 }
-</style>
+</style>

src/views/categroyManager/vipActiveList.vue

@@ -1018,7 +1018,7 @@ export default {
       // let rules = JSON.stringify(this.rules);
       // let searchForm = JSON.stringify(this.searchForm);
       this.$router.push({
-        path: "/vipClassSet/vipNewActive?type=create",
+        path: "/vipNewActive?type=create",
         // query: { rules, searchForm },
       });
     },

src/views/categroyManager/vipNewActive.vue

@@ -489,7 +489,7 @@ export default {
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/vipClassSet/vipActiveList",
+        path: "/vipActiveManager/vipActiveList",
         query: { rules: this.rules, searchForm: this.searchForm }
       });
     },

src/views/evaluateManager/evaluateDetail.vue

@@ -246,8 +246,8 @@ export default {
       });
     },
     onCancel () {
-      this.$store.dispatch('delVisitedViews', this.$route) 
-      this.$router.push({ path: '/operateManager/commentManager', query: { search: this.Fsearch, rules: this.Frules, activeIndex: '1' } })
+      this.$store.dispatch('delVisitedViews', this.$route)
+      this.$router.push({ path: '/commentManager', query: { search: this.Fsearch, rules: this.Frules, activeIndex: '1' } })
     }
   }
 };
@@ -294,4 +294,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/evaluateManager/evaluateList.vue

@@ -266,7 +266,7 @@ export default {
       let search = JSON.stringify(this.searchForm);
       let rules = JSON.stringify(this.rules);
       this.$router.push({
-        path: "/operateManager/evaluateDetail",
+        path: "/evaluateDetail",
         query: { id, evaluateId, search, rules },
       });
     },

src/views/evaluateManager/index.vue

@@ -4,7 +4,6 @@
       <div class="squrt"></div>评论管理
     </h2>
     <div class="m-core">
-
       <tab-router v-model.trim="activeIndex"
                type="card"
                @tab-click="handleClick">
@@ -41,13 +40,14 @@ export default {
   },
   data () {
      const query = this.$route.query
+    //      studentVip: permission("/studentVip"),
     return {
       activeIndex: "1",
       permissionList: {
-        evaluateList: permission("/commentManager/evaluateList"),
-        networkList: permission("/commentManager/networkList"),
-        studentVip: permission("/studentDetail/studentVip"),
-        vipEvaluateList: permission("/commentManager/vipEvaluateList"),
+        evaluateList: permission("/evaluateList"),
+        networkList: permission("/networkList"),
+
+        vipEvaluateList: permission("/vipEvaluateList"),
       },
     }
   },

src/views/luckyDraw/lotteryManager.vue

@@ -192,7 +192,7 @@ export default {
         },
         onLook(row) {
             this.$router.push({
-                path: '/luckyDraw/trophyManager',
+                path: '/trophyManager',
                 query: {
                     groupId: row.id
                 }
@@ -200,4 +200,4 @@ export default {
         }
     }
 };
-</script>
+</script>

src/views/operateManager/serverIndexDetail.vue

@@ -243,9 +243,9 @@ export default {
       });
     },
     goBack() {
-       this.$store.dispatch('delVisitedViews', this.$route) 
+       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/operateManager/serverIndexList",
+        path: "/serverIndexManager/serverIndexList",
       });
     },
     getComment(item, index, subIndex) {

src/views/operateManager/serverIndexList.vue

@@ -657,7 +657,7 @@ export default {
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
       this.$router.push({
-        path: "/operateManager/serverIndexDetail",
+        path: "/serverIndexDetail",
         query: {
           studentId: row.studentId,
           studentName: row.studentName,

src/views/resetTeaming/components/resetPayList.vue

@@ -595,7 +595,7 @@ export default {
       if (row.payUserType === "SCHOOL") {
         this.reviewVisible = true;
       } else {
-        this.$router.push({ path: "/business/strudentPayInfo", query });
+        this.$router.push({ path: "/strudentPayInfo", query });
       }
     },
     setStudentPay () {

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -614,19 +614,19 @@ export default {
       if (query.type == "resetTeam") {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
-          path: "/business/resetTeaming",
+          path: "/resetTeaming",
           query: { ...this.$route.query },
         });
       } else if (query.type == "look") {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
-          path: "/business/teamLookBase",
+          path: "/resetTeaming",
           query: { ...this.$route.query },
         });
       }else if(query.type == 'PRE_BUILD_FEE'){
              this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
-          path: "/business/createPayment",
+          path: "/resetTeaming",
           query: { ...this.$route.query },
         });
       }

src/views/resetTeaming/index.vue

@@ -53,11 +53,11 @@
           />
         </el-tab-pane>
         <el-tab-pane lazy label="乐器清单" name="10" :disabled="!teamid" v-if="permission('/teamMusicList')" >
-          <musicOrder />
+          <musicOrder  v-if="activeIndex == '10'"/>
         </el-tab-pane>
         <el-tab-pane
           label="老师列表"
-          v-if="permission('/teamDetails/teacherList')"
+          v-if="permission('/teamTeacherList')"
           name="4"
           :disabled="!teamid"
         >
@@ -65,7 +65,7 @@
         </el-tab-pane>
         <el-tab-pane
           label="学生列表"
-          v-if="permission('/teamDetails/studentList')"
+          v-if="permission('/teamStudentList')"
           name="7"
           :disabled="!teamid"
         >
@@ -87,7 +87,7 @@
         <el-tab-pane
           label="课表详情"
           lazy
-          v-if="permission('/teamDetails/courseList')"
+          v-if="permission('/teamCourseListInfo')"
           name="8"
           :disabled="!teamid"
         >
@@ -120,7 +120,7 @@
           />
         </el-tab-pane>
         <!--   v-if="permission('/resetTeaming/coursePlan')" -->
-        <el-tab-pane label="乐团日志" :disabled="!teamid" name="11">
+        <el-tab-pane label="乐团日志" :disabled="!teamid" name="11"  v-if="permission('/teamJournal')">
           <teamJournal :teamid="teamid" v-if="activeIndex == 11" />
         </el-tab-pane>
         <!-- <el-tab-pane label="新增小班课"
@@ -237,7 +237,7 @@ export default {
     },
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
-      this.$router.push({ path: "/business/teamDetail" });
+      this.$router.push({ path: "/teamList" });
     },
     getBaseInfo(baseInfo) {
       this.baseInfo = baseInfo;

src/views/studentManager/components/studentNetwork.vue

@@ -137,7 +137,7 @@ export default {
     },
     gotoNet(str) {
       this.$router.push({
-        path: "/business/accompany",
+        path: "/accompanyManager/accompany",
         query: { search: str },
       });
     },

src/views/studentManager/components/studentVip.vue

@@ -221,7 +221,7 @@ export default {
       this.getCourseList();
     },
     gotoVip(str) {
-       this.$router.push({path:'/business/vipList',query:{search:str}})
+       this.$router.push({path:'/vipManager/vipList',query:{search:str}})
     },
   },
 };

src/views/teacherManager/teacherDetail/index.vue

@@ -175,7 +175,7 @@ export default {
       gotoAfterSchool() {
       // 需要的参数 id
       this.$router.push({
-        path: "/operateManager/serverIndexList",
+        path: "/serverIndexManager/serverIndexList",
         query: { teacherId:  this.teacherId*1, activeIndex: "2" },
       });
     },

src/views/teamBuild/components/teamSoundSet.vue

@@ -33,20 +33,14 @@
         type="primary"
         @click="approval"
         v-if="teamStatus == 'teamAudit'"
-        v-permission="{
-          child: 'musicGroup/auditSuccess',
-          parent: '/teamBuild/teamAudit/soundMoney',
-        }"
+        v-permission="'musicGroup/auditSuccess'"
         >审核通过</el-button
       >
       <el-button
         type="danger"
         @click="refuse"
         v-if="teamStatus == 'teamAudit'"
-        v-permission="{
-          child: 'musicGroup/auditFailed',
-          parent: '/teamBuild/teamAudit/soundMoney',
-        }"
+        v-permission="'musicGroup/auditFailed'"
         >驳回</el-button
       >
       <div

src/views/teamDetail/components/studentList.vue

@@ -175,7 +175,7 @@
         </el-popover>
       </div>
       <p
-        style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
+        style="margin-bottom: 15px; font-size: 16px; font-weight: 400"
         v-if="
           team_status == 'PAY' ||
           team_status == 'PROGRESS' ||

src/views/teamDetail/components/teacherList.vue

@@ -142,11 +142,11 @@ export default {
   mounted() {
     this.teamid = this.$route.query.id;
     this.getList();
-    getAllClass({ musicGroupId: this.teamid }).then((res) => {
-      if (res.code == 200) {
-        this.mixCourseList = res.data;
-      }
-    });
+    // getAllClass({ musicGroupId: this.teamid }).then((res) => {
+    //   if (res.code == 200) {
+    //     this.mixCourseList = res.data;
+    //   }
+    // });
   },
   activated() {
     this.teamid = this.$route.query.id;

src/views/teamDetail/teamCourseList.vue

@@ -1029,12 +1029,12 @@ export default {
         });
       } else if (row.groupType == "VIP") {
         this.$router.push({
-          path: "/business/vipList",
+          path: "/vipManager/vipList",
           query: { search: row.musicGroupId },
         });
       } else if (row.groupType == "PRACTICE") {
         this.$router.push({
-          path: "/business/accompany",
+          path: "/accompanyManager/accompany",
           query: { search: row.musicGroupId },
         });
       }

src/views/teamDetail/teamList.vue

@@ -201,13 +201,13 @@
                 <!-- 审核中 编辑 -->
                 <el-button
                   type="text"
-                  v-if="scope.row.status == 'AUDIT' && permission('/teamAudit')"
+                  v-if="scope.row.status == 'AUDIT' && permission('musicGroup/auditSuccess')"
                   @click="lookTeamDetail(scope.row)"
                   >审核</el-button
                 >
                 <el-button
                   type="text"
-                  v-if="scope.row.status == 'DRAFT' && permission('/teamDraft')"
+                  v-if="scope.row.status == 'DRAFT' && permission('musicGroup/update')"
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
                 >
@@ -216,7 +216,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'AUDIT_FAILED' &&
-                    permission('/auditFailed')
+                    permission('musicGroup/update')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
@@ -235,7 +235,7 @@
                       scope.row.status == 'PREPARE' ||
                         scope.row.status == 'CLOSE' ||
                       scope.row.status == 'FEE_AUDIT') &&
-                    permission('/teamLookBase')
+                    permission('/resetTeaming')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >详情</el-button
@@ -471,7 +471,7 @@ export default {
       this.$store.dispatch("buildIndex", 0);
       this.$store.dispatch("delVisitedViews", { path: "/business/teamBuild" });
     this.$router.push({
-            path: "/business/resetTeaming",
+            path: "/resetTeaming",
               query: { type: "newTeam"}},
             (router) => {
               router.meta.title = "新建乐团";
@@ -496,7 +496,7 @@ export default {
       sessionStorage.removeItem(`${row.id}sound`);
       this.$nextTick((res) => {
         this.$router.push({
-          path: "/business/resetTeaming",
+          path: "/resetTeaming",
           query: { type: "resetTeam", id: row.id },
         });
       });
@@ -630,7 +630,7 @@ export default {
           //   }
           // );
           this.$router.push({
-            path: "/business/resetTeaming",
+            path: "/resetTeaming",
               query: { type: "teamDraft", id: row.id,team_status:row.status }},
             (router) => {
               router.meta.title = "乐团编辑中";
@@ -644,7 +644,7 @@ export default {
           this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/resetTeaming",
+              path: "/resetTeaming",
               query: { type: "teamAudit", id: row.id, clear: "true",team_status:row.status },
             },
             (router) => {
@@ -660,7 +660,7 @@ export default {
           //   query: { type: "PRE_BUILD_FEE", id: row.id, name: row.name },
           // });
           this.$router.push({
-            path: "/business/resetTeaming",
+            path: "/resetTeaming",
             query: {
               type: "look",
               id: row.id,
@@ -678,7 +678,7 @@ export default {
           this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/resetTeaming",
+              path: "/resetTeaming",
               query: { type: "feeAudit", id: row.id, clear: "true",team_status:row.status },
             },
             (router) => {
@@ -692,7 +692,7 @@ export default {
           this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/resetTeaming",
+              path: "/resetTeaming",
               query: { type: "teamDraft", id: row.id, clear: "true",team_status:row.status },
             },
             (router) => {
@@ -705,7 +705,7 @@ export default {
           // 预报名
 
           this.$router.push({
-            path: "/business/resetTeaming",
+            path: "/resetTeaming",
             query: {
               type: "look",
               id: row.id,
@@ -725,7 +725,7 @@ export default {
           // 报名中
           this.$router.push(
             {
-              path: `/business/resetTeaming`,
+              path: `/resetTeaming`,
               query: {
                 status: row.status,
                 id: row.id,
@@ -744,7 +744,7 @@ export default {
           // 缴费中
           this.$router.push(
             {
-              path: `/business/resetTeaming`,
+              path: `/resetTeaming`,
               query: {
                 status: row.status,
                 id: row.id,
@@ -762,7 +762,7 @@ export default {
         case "PREPARE": {
           // 筹备中 跳转到乐团设置界面
           this.$router.push({
-            path: `/business/resetTeaming`,
+            path: `/resetTeaming`,
             query: {  type:'look',status: row.status, id: row.id, name: row.name,team_status:row.status },
           },
            (router) => {
@@ -774,7 +774,7 @@ export default {
           // 进行中
           // 调到乐团详情 teamDetails
           this.$router.push({
-            path: `/business/resetTeaming`,
+            path: `/resetTeaming`,
             query: {
               status: row.status,
               id: row.id,
@@ -793,7 +793,7 @@ export default {
           // 取消
           this.$router.push(
             {
-              path: "/business/resetTeaming",
+              path: "/resetTeaming",
               query: { type: "teamCanceled", id: row.id ,team_status:row.status},
             },
             (router) => {
@@ -809,7 +809,7 @@ export default {
           //   query: { status: row.status, id: row.id, name: row.name },
           // });
           this.$router.push({
-            path: "/business/resetTeaming",
+            path: "/resetTeaming",
             query: { type: "resetTeam", id: row.id,team_status:row.status },
           },
           (router) => {
@@ -820,7 +820,7 @@ export default {
         }case "CLOSE":{
           this.$router.push(
             {
-              path: `/business/resetTeaming`,
+              path: `/resetTeaming`,
               query: {
                 status: row.status,
                 id: row.id,

src/views/vipClass/vipDetail/index.vue

@@ -90,7 +90,7 @@ export default {
     },
     onCancel () {
        this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/business/vipList' })
+      this.$router.push({ path: '/vipManager/vipList' })
     }
   }
 }

src/views/vipClass/vipReset.vue

@@ -670,7 +670,7 @@ export default {
     goBack () {
         this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/business/vipList",
+        path: "/vipManager/vipList",
       });
     },
     resetClass (row) {