mo 4 years ago
parent
commit
db43569992

+ 0 - 10
src/api/buildTeam.js

@@ -127,16 +127,6 @@ export function getStudentList (data) {
   })
 }
 
-// 分页查询收费类型
-export function getPayStatus (data) {
-  return request({
-    url: api + '/chargeType/queryPage',
-    method: 'get',
-    params: data
-
-  })
-}
-
 // 根据乐团id查询未分班的学生(根据多声部)
 export function getNoClassStudent (data) {
   return request({

+ 1 - 0
src/components/tab-router/index.vue

@@ -73,6 +73,7 @@ export default {
           [this.searchKey]: item.name,
         }),
       });
+
       this.$store.dispatch("addVisitedViews",  this.$route);
       const parentClick = this.$listeners["tab-click"];
       if (parentClick) {

+ 1 - 1
src/main.js

@@ -8,7 +8,7 @@ import isBetween from 'dayjs/plugin/isBetween'
 import numeral from 'numeral'
 import lodash from 'lodash'
 import qs from 'qs'
-import { permission,getFullPermission } from "@/utils/directivePage";
+import { permission } from "@/utils/directivePage";
 
 dayjs.extend(isSameOrBefore)
 dayjs.extend(isSameOrAfter)

+ 1 - 1
src/router/index.js

@@ -407,13 +407,13 @@ export const asyncRoutes = {
   parameter: () => import('@/views/courseListManager'),
   // 抽奖活动
   luckyDraw:()=>import('@/views/courseListManager'),
+  // 乐团管理
   teamMananger:()=>import('@/views/courseListManager'),
   // vip管理
   vipManager:()=>import('@/views/courseListManager'),
   // 网管课管理
   accompanyManager:()=>import('@/views/courseListManager'),
   // 乐团管理
-
   // 评论管理
   commentManagerWrap:()=>import('@/views/courseListManager'),
   // 课外训练

+ 43 - 30
src/views/resetTeaming/index.vue

@@ -4,15 +4,18 @@
       <el-page-header @back="onCancel" :content="teamName"></el-page-header>
     </h2>
     <div class="m-core">
-      <p class="msg" :class="team_status">
-        <img
-          :src="stepImgs[team_status]"
-          alt=""
-        />
+      <p class="msg" :class="team_status" v-if="team_status">
+        <img :src="stepImgs[team_status]" alt="" />
         {{ musicGroupType[team_status] }}
       </p>
       <!-- navMenu -->
-      <tab-router v-model.trim="activeIndex" type="card" ref="tab">
+      <tab-router
+        v-model="activeIndex"
+        type="card"
+        ref="tab"
+
+      >
+       <!-- @tab-click="handleClick" -->
         <el-tab-pane
           label="基本信息"
           lazy
@@ -24,6 +27,7 @@
             @getBaseInfo="getBaseInfo"
             :baseInfo="baseInfo"
             @getName="getName"
+            @handleClick="handleClick"
           />
         </el-tab-pane>
         <el-tab-pane
@@ -31,10 +35,11 @@
           lazy
           v-if="permission('/resetTeaming/resetSound')"
           name="2"
+          :disabled="!teamid"
         >
           <resetSound v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane lazy label="预报名信息" name="9">
+        <el-tab-pane lazy label="预报名信息" name="9" :disabled="!teamid">
           <!--         v-if="
             team_status == 'PRE_APPLY' ||
             team_status == 'PRE_BUILD_FEE' ||
@@ -46,13 +51,14 @@
             :isedit="team_status == 'PRE_APPLY'"
           />
         </el-tab-pane>
-        <el-tab-pane lazy label="乐器清单" name="10">
+        <el-tab-pane lazy label="乐器清单" name="10" :disabled="!teamid">
           <musicOrder />
         </el-tab-pane>
         <el-tab-pane
           label="老师列表"
           v-if="permission('/teamDetails/teacherList')"
           name="4"
+          :disabled="!teamid"
         >
           <teacherList :teamid="teamid" v-if="activeIndex == 4" />
         </el-tab-pane>
@@ -60,6 +66,7 @@
           label="学生列表"
           v-if="permission('/teamDetails/studentList')"
           name="7"
+          :disabled="!teamid"
         >
           <studentList :teamid="teamid" v-if="activeIndex == 7" />
         </el-tab-pane>
@@ -69,6 +76,7 @@
           lazy
           v-if="permission('/resetTeaming/resetClass')"
           name="5"
+          :disabled="!teamid"
         >
           <resetClass
             v-if="activeIndex == 5 && musicGroupInfo"
@@ -80,6 +88,7 @@
           lazy
           v-if="permission('/teamDetails/courseList')"
           name="8"
+          :disabled="!teamid"
         >
           <courseList v-if="activeIndex == '8'" :teamid="teamid" />
         </el-tab-pane>
@@ -88,6 +97,7 @@
           lazy
           v-if="permission('/resetTeaming/resetPayList')"
           name="3"
+          :disabled="!teamid"
         >
           <resetPayList
             :baseInfo="baseInfo"
@@ -100,6 +110,7 @@
           lazy
           v-if="permission('/resetTeaming/resetPayList')"
           name="6"
+          :disabled="!teamid"
         >
           <resetPayListSchool
             :baseInfo="baseInfo"
@@ -107,12 +118,9 @@
             @changeActive="handleClick"
           />
         </el-tab-pane>
-  <!--   v-if="permission('/resetTeaming/coursePlan')" -->
-        <el-tab-pane label="乐团日志"
-
-                     name="11">
-          <teamJournal :teamid='teamid'
-                      v-if="activeIndex == 11" />
+        <!--   v-if="permission('/resetTeaming/coursePlan')" -->
+        <el-tab-pane label="乐团日志" :disabled="!teamid" name="11">
+          <teamJournal :teamid="teamid" v-if="activeIndex == 11" />
         </el-tab-pane>
         <!-- <el-tab-pane label="新增小班课"
                      name="5">
@@ -126,7 +134,7 @@
 <script>
 import teamBaseInfo from "@/views/teamBuild/components/teamBaseInfo";
 // import resetSound from "@/views/resetTeaming/components/resetSoundv2";
-import resetSound from "@/views/teamBuild/components/teamSoundSet"
+import resetSound from "@/views/teamBuild/components/teamSoundSet";
 import resetClass from "@/views/teamDetail/components/resetClass";
 // import coursePlan from '@/views/teamBuild/teamSeting/components/coursePlan'
 // import lookCourse from '@/views/teamBuild/teamSeting/components/lookCourse'
@@ -139,10 +147,10 @@ import teacherList from "@/views/teamDetail/components/teacherList";
 import courseList from "@/views/teamDetail/components/courseList";
 import forecastName from "@/views/teamBuild/forecastName";
 import musicOrder from "@/views/teamDetail/teamDetailedList";
-import teamJournal from "@/views/teamBuild/components/teamJournal"
+import teamJournal from "@/views/teamBuild/components/teamJournal";
 import { permission } from "@/utils/directivePage";
 import { getTeamBaseInfo } from "@/api/buildTeam";
-import { musicGroupType} from '@/constant'
+import { musicGroupType } from "@/constant";
 export default {
   components: {
     teamBaseInfo,
@@ -156,7 +164,7 @@ export default {
     courseList,
     forecastName,
     musicOrder,
-    teamJournal
+    teamJournal,
   },
   name: "resetTeaming",
   data() {
@@ -172,7 +180,7 @@ export default {
       //   coursePlan: true,
       // }
       name: null,
-      teamName: "乐团修改",
+      teamName: "新建乐团",
       musicGroupInfo: null,
       musicGroupType,
       team_status: "",
@@ -218,7 +226,7 @@ export default {
       // this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
       this.team_status = this.$route.query.team_status;
-      if (this.$route.query.tabrouter != 1) {
+      if (this.$route.query.tabrouter != 1 && this.teamid) {
         getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
             this.getBaseInfo(res.data);
@@ -236,14 +244,17 @@ export default {
       this.musicGroupInfo = baseInfo?.musicGroup;
     },
     handleClick(val) {
-      // this.activeIndex = val.name
-      this.$refs.tab.tab(val);
+      this.teamid = this.$route.query.id;
+      // this.team_status = this.$route.query.team_status;
+      // console.log('切换tab',val)
+   this.$refs.tab.tab(val);
+      // this.activeIndex = val.name;
     },
     permission(str) {
       return permission(str);
     },
     getName(val) {
-      // this.name = val
+      this.name = val
     },
   },
 };
@@ -254,7 +265,6 @@ export default {
 //         CLOSE: require("@/assets/images/base/end.png"),
 //         PAUSE: require("@/assets/images/base/end.png"),
 
-
 //         PROGRESS: require("@/assets/images/base/ing.png"),
 //         DRAFT: require("@/assets/images/base/ing.png"),
 //         AUDIT: require("@/assets/images/base/ing.png"),
@@ -264,14 +274,17 @@ export default {
 //         APPLYL: require("@/assets/images/base/clock.png"),
 //         PAY: require("@/assets/images/base/pay.png"),
 //         PREPARE: require("@/assets/images/base/ing.png"),
-.msg.PAY{
- color: #f85043;
+.msg.PAY {
+  color: #f85043;
 }
-.msg.APPLY{
- color: #f97215;
+.msg.APPLY {
+  color: #f97215;
 }
-.msg.AUDIT_FAILED,.msg.CANCELED,.msg.CLOSE,.msg.PAUSE {
-    color: #777;
+.msg.AUDIT_FAILED,
+.msg.CANCELED,
+.msg.CLOSE,
+.msg.PAUSE {
+  color: #777;
 }
 .msg {
   color: #14928a;

+ 36 - 36
src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -413,9 +413,9 @@ export default {
       if (!flag) return;
       // 新建团
       let obj = {};
-      if (this.teamStatus == "newTeam") {
-        this.initCreateTeam(obj);
-      }
+      // if (this.teamStatus == "newTeam") {
+      //   this.initCreateTeam(obj);
+      // }
       //  初始化声部
       obj.musicGroupSubjectGoodsGroups = [];
       obj.musicGroupSubjectPlans = [];
@@ -501,40 +501,40 @@ export default {
         });
       });
       if (this.teamStatus == "newTeam") {
-        createTeam(obj).then((res) => {
-          if (res.code == 200) {
-            // 成功 跳转到乐团报名详情
-            // let query = this.$route.query;
-            // query.type = "teamDraft";
-            // this.$router.push({
-            //   query: {
-            //     ...query,
-            //     id: res.data,
-            //   },
-            // });
-            // this.$emit("chiosetab", 2);
-            // this.$emit("getBaseInfo", obj);
-            //  zheli
+        // createTeam(obj).then((res) => {
+        //   if (res.code == 200) {
+        //     // 成功 跳转到乐团报名详情
+        //     // let query = this.$route.query;
+        //     // query.type = "teamDraft";
+        //     // this.$router.push({
+        //     //   query: {
+        //     //     ...query,
+        //     //     id: res.data,
+        //     //   },
+        //     // });
+        //     // this.$emit("chiosetab", 2);
+        //     // this.$emit("getBaseInfo", obj);
+        //     //  zheli
 
-            // 把第3步单独拆出来做成独立的模块
-            this.$confirm("乐团创建成功,是否提交审核?", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning",
-            })
-              .then(() => {
-                this.teamStatus = "teamDraft";
-                this.teamid = res.data;
-                this.submitInfo(1);
-              })
-              .catch(() => {
-                this.$store.dispatch("delVisitedViews", this.$route);
-                this.$router.push({
-                  path: "/business/teamDetail",
-                });
-              });
-          }
-        });
+        //     // 把第3步单独拆出来做成独立的模块
+        //     this.$confirm("乐团创建成功,是否提交审核?", "提示", {
+        //       confirmButtonText: "确定",
+        //       cancelButtonText: "取消",
+        //       type: "warning",
+        //     })
+        //       .then(() => {
+        //         this.teamStatus = "teamDraft";
+        //         this.teamid = res.data;
+        //         this.submitInfo(1);
+        //       })
+        //       .catch(() => {
+        //         this.$store.dispatch("delVisitedViews", this.$route);
+        //         this.$router.push({
+        //           path: "/business/teamDetail",
+        //         });
+        //       });
+        //   }
+        // });
       } else {
         obj.musicGroupId = this.teamid;
         console.log(obj,type)

+ 117 - 85
src/views/teamBuild/components/teamBaseInfo.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="base-container">
-
     <div class="banseLeft">
       <div class="head">乐团基本信息:</div>
       <!-- <div class="num">乐团编号:dywh01</div> -->
@@ -143,7 +142,7 @@
             clearable
           >
             <el-option
-              v-for="(item) in bossList"
+              v-for="item in bossList"
               :key="item.userId"
               :label="item.realName"
               :value="item.userId"
@@ -232,7 +231,7 @@
             v-model.trim="startClassString"
             :disabled="basdisabled"
           ></el-input> -->
-          <!-- <el-tooltip
+        <!-- <el-tooltip
             class="item"
             effect="dark"
             :content="startClassString"
@@ -333,7 +332,13 @@
           修改
         </div> -->
         <!-- 审批或者草稿的下一步 -->
-        <div class="nextBtn" @click="gotoNext(1)" v-if="!basdisabled">保存</div>
+        <div
+          class="nextBtn"
+          @click="gotoNext(teamStatus == 'newTeam' ? 0 : 1)"
+          v-if="!basdisabled"
+        >
+          保存
+        </div>
         <!-- <div
           class="nextBtn"
           @click="
@@ -349,7 +354,6 @@
         </div> -->
       </div>
     </div>
-
   </div>
 </template>
 <script>
@@ -361,9 +365,10 @@ import {
   getStudentList,
   musicGroupOpenPay,
   extensionPayment,
-   extensionApplyExpire,
+  extensionApplyExpire,
   findUserByRole,
-  getTeacher
+  getTeacher,
+  createTeam,
 } from "@/api/buildTeam";
 import { findTechnician } from "@/api/repairManager";
 import dayjs from "dayjs";
@@ -421,8 +426,8 @@ export default {
       typeList: [], // 收费类型列表
       cooperationList: [], // 教学点列表
       teacherList: [], // 获取老师列表
-      educationList:[], // 乐团主管
-      bossList:[],
+      educationList: [], // 乐团主管
+      bossList: [],
       addList: [], // 教学地点列表
       activeTeam: [],
       teamid: "",
@@ -432,7 +437,7 @@ export default {
       basdisabled: false,
       // 整合报名中
       paymentExpireDate: "",
-         applyExpireDate:null,
+      applyExpireDate: null,
       mergeVisible: false,
       team_status: "",
       paymentNum: 0,
@@ -470,7 +475,6 @@ export default {
     }
     this.teamStatus = this.$route.query.type;
     this.team_status = this.$route.query.team_status;
-    console.log(this.team_status);
     if (this.$route.query.type == "newTeam") {
       this.onReset();
     }
@@ -512,7 +516,6 @@ export default {
   deactivated() {},
   beforeDestroy() {
     this.topFrom.paymentExpireDate = this.paymentExpireDate;
-    console.log( this.topFrom.paymentExpireDate )
     sessionStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
   },
 
@@ -586,24 +589,23 @@ export default {
               // }
 
               // 头部
-             this.setBase(res)
+              this.setBase(res);
               // // 循环缴费月
               // this.payList.chioseMonth = res.data.months;
               if (res.data.musicGroup.organId) {
                 // 获取员工
-                 this.getBaseList(res.data.musicGroup.organId)
+                this.getBaseList(res.data.musicGroup.organId);
               }
               this.$emit("getBaseInfo", res.data);
             }
           });
         } else {
           this.topFrom = sotrage;
-          this.applyExpireDate = sotrage.time
-          this.paymentExpireDate = Storage.paymentExpireDate
-          console.log( sotrage,this.applyExpireDate,this.paymentExpireDate)
+          this.applyExpireDate = sotrage.time;
+          this.paymentExpireDate = Storage.paymentExpireDate;
           if (this.topFrom.section) {
             // 获取员工
-             this.getBaseList(this.topFrom.section)
+            this.getBaseList(this.topFrom.section);
           }
         }
       }
@@ -630,9 +632,9 @@ export default {
       this.topFrom.school = "";
       this.topFrom.address = "";
       // 发请求 根据分部id 查询所有员工
-      this.getBaseList(val)
+      this.getBaseList(val);
     },
-    async getBaseList(val){
+    async getBaseList(val) {
       // 合作单位
       queryByOrganId({ organId: val }).then((res) => {
         if (res.code == 200) {
@@ -653,24 +655,30 @@ export default {
       });
       // 获取乐团主管
       try {
-        const ruselt = await findUserByRole({organId: val,employeeRole:'EDUCATION' })
-        this.educationList = ruselt.data
-      }catch(e){
-        console.log(e)
+        const ruselt = await findUserByRole({
+          organId: val,
+          employeeRole: "EDUCATION",
+        });
+        this.educationList = ruselt.data;
+      } catch (e) {
+        console.log(e);
       }
       // 获取运营主管
-          try {
-        const ruselt = await findUserByRole({organId: val,employeeRole:'TEAM_TEACHER' })
-        this.bossList = ruselt.data
-      }catch(e){
-        console.log(e)
+      try {
+        const ruselt = await findUserByRole({
+          organId: val,
+          employeeRole: "TEAM_TEACHER",
+        });
+        this.bossList = ruselt.data;
+      } catch (e) {
+        console.log(e);
       }
       // 获取指导老师
-      getTeacher({organId: val}).then(res=>{
-        if(res.code == 200){
-          this.teacherList = res.data
+      getTeacher({ organId: val }).then((res) => {
+        if (res.code == 200) {
+          this.teacherList = res.data;
         }
-      })
+      });
     },
     chioseSchool(val) {},
     gotoNext(num) {
@@ -710,7 +718,7 @@ export default {
               break;
             }
             case "newTeam": {
-              status = null;
+              status = "DRAFT";
               break;
             }
             case "teamList": {
@@ -757,21 +765,48 @@ export default {
             feeType: this.topFrom.feeType,
           };
           obj.musicGroupPaymentEntities = [];
-          // 发请求
-          resetTeamBaseInfo(obj).then((res) => {
-            if (res.code == 200) {
-              if (this.teamStatus == "teamDraft") {
-                this.$message.success("保存成功");
-                // 跳到第二页
+          // createTeam
+          if (this.teamStatus != "newTeam") {
+            resetTeamBaseInfo(obj).then((res) => {
+              if (res.code == 200) {
+                if (this.teamStatus == "teamDraft") {
+                  this.$message.success("保存成功");
+                  // 跳到第二页
+                } else {
+                  this.$message.success("修改乐团成功");
+                  // this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
+                }
+                this.init();
+              }
+            });
+          } else {
+            // 发送建团申请 成功后跳到第二页
 
-                this.$emit("chiosetab", 1);
-              } else {
-                this.$message.success("修改乐团成功");
-                // this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
+            createTeam(obj).then((res) => {
+              if (res.code == 200) {
+                // this.$message.success('建团成功,请设置声部信息')
+                // this.$emit("chiosetab", 1);
+                this.$confirm("新建乐团成功是否继续设置声部信息", "提示", {
+                  confirmButtonText: "是",
+                  cancelButtonText: "否",
+                  type: "warning",
+                })
+                  .then(() => {
+                    this.$router.push({
+                      query: merge(this.$route.query, {
+                        type: "teamDraft",
+                        id: res.data,
+                        team_status: "DRAFT",
+                      }),
+                    });
+                    this.$emit('handleClick',{name:'2'})
+                    this.$emit('getName', this.topFrom.name)
+                  })
+                  .catch(() => {});
               }
-              this.init();
-            }
-          });
+            });
+          }
+          // 发请求
         }
       });
     },
@@ -842,6 +877,7 @@ export default {
         page: 1,
         rows: 9999,
       };
+      if (!this.teamid) return;
       getStudentList(obj).then((res) => {
         if (res.code == 200) {
           res.data.rows.forEach((item) => {
@@ -946,7 +982,7 @@ export default {
                 getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
                   if (res.code == 200) {
                     this.applyExpireDate = res.data.musicGroup.applyExpireDate;
-                     this.setBase(res)
+                    this.setBase(res);
                   }
                 });
               } else {
@@ -1003,41 +1039,39 @@ export default {
       });
       //  this.$router.replace({query:{...this.$route.query,tabrouter:7}})
     },
-    setBase(res){
-       this.topFrom.name = res.data.musicGroup.name;
-              this.$emit("getName", this.topFrom.name);
-              this.topFrom.time = res.data.musicGroup.applyExpireDate;
-              this.topFrom.type = res.data.musicGroup.chargeTypeId;
-              this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
-                ","
-              );
-              this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
-              this.topFrom.paymentValidStartDate =
-                res.data.musicGroup.paymentValidStartDate;
-              this.topFrom.paymentValidEndDate =
-                res.data.musicGroup.paymentValidEndDate;
-              this.topFrom.section = res.data.musicGroup.organId;
-              this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
-              this.topFrom.school = res.data.musicGroup.cooperationOrganId;
-              this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
-              this.topFrom.boss = res.data.musicGroup.teamTeacherId;
-              this.topFrom.address = res.data.musicGroup.schoolId;
-              this.topFrom.salary = res.data.musicGroup.settlementType;
-              this.topFrom.head = res.data.musicGroup.directorUserId
-                ? res.data.musicGroup.directorUserId
-                : null;
-              this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
-              this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
-              this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
-              this.topFrom.repairUserId = res.data.musicGroup.repairUserId
-                ? res.data.musicGroup.repairUserId
-                : null;
-              this.topFrom.feeType = res.data.musicGroup.feeType
-                ? res.data.musicGroup.feeType
-                : null;
-              this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
-              this.applyExpireDate = res.data.musicGroup.applyExpireDate;
-    }
+    setBase(res) {
+      this.topFrom.name = res.data.musicGroup.name;
+      this.$emit("getName", this.topFrom.name);
+      this.topFrom.time = res.data.musicGroup.applyExpireDate;
+      this.topFrom.type = res.data.musicGroup.chargeTypeId;
+      this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(",");
+      this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
+      this.topFrom.paymentValidStartDate =
+        res.data.musicGroup.paymentValidStartDate;
+      this.topFrom.paymentValidEndDate =
+        res.data.musicGroup.paymentValidEndDate;
+      this.topFrom.section = res.data.musicGroup.organId;
+      this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
+      this.topFrom.school = res.data.musicGroup.cooperationOrganId;
+      this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
+      this.topFrom.boss = res.data.musicGroup.teamTeacherId;
+      this.topFrom.address = res.data.musicGroup.schoolId;
+      this.topFrom.salary = res.data.musicGroup.settlementType;
+      this.topFrom.head = res.data.musicGroup.directorUserId
+        ? res.data.musicGroup.directorUserId
+        : null;
+      this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
+      this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
+      this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
+      this.topFrom.repairUserId = res.data.musicGroup.repairUserId
+        ? res.data.musicGroup.repairUserId
+        : null;
+      this.topFrom.feeType = res.data.musicGroup.feeType
+        ? res.data.musicGroup.feeType
+        : null;
+      this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
+      this.applyExpireDate = res.data.musicGroup.applyExpireDate;
+    },
   },
   computed: {
     startClassString() {
@@ -1211,8 +1245,6 @@ export default {
 }
 </style>
 <style scoped lang="scss">
-
-
 /deep/.el-date-editor {
   width: 180px !important;
 }

+ 26 - 11
src/views/teamDetail/components/resetClass.vue

@@ -27,8 +27,9 @@
       </div>
       <div
         class="newBand"
-        style="width:120px"
+        style="width: 120px"
         v-permission="'courseSchedule/coursePostpone'"
+        v-if="team_status == 'PROGRESS'"
         @click="postpone"
       >
         课程顺延
@@ -42,7 +43,11 @@
           tooltip-effect="dark"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column
+            type="selection"
+            width="55"
+            v-if="team_status == 'PROGRESS'"
+          ></el-table-column>
           <el-table-column
             align="center"
             prop="name"
@@ -103,7 +108,7 @@
               <div>{{ scope.row.lockFlag | yesOrNo }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="240px" label="操作">
+          <el-table-column align="center" width="240px" label="操作"   v-if="team_status == 'PREPARE'||team_status == 'PROGRESS'">
             <template slot-scope="scope" v-if="scope.row.lockFlag != 1">
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
@@ -123,9 +128,10 @@
                 <el-button
                   type="text"
                   v-if="
-                    permission('classGroup/classGroupUpdate') ||
-                    permission('classGroup/revisionClassGroup') ||
-                    permission('classGroup/revisionAddClassGroup')
+                    (permission('classGroup/classGroupUpdate') ||
+                      permission('classGroup/revisionClassGroup') ||
+                      permission('classGroup/revisionAddClassGroup')) &&
+                    team_status == 'PROGRESS'
                   "
                   @click="classAdjustment(scope.row)"
                   >排课</el-button
@@ -139,8 +145,15 @@
                   @click="removeClass(scope)"
                   >删除</el-button
                 >
-                 <el-button type='text'
-                         @click="signPostpone(scope.row)">顺延课程</el-button>
+                <el-button
+                  type="text"
+                  v-if="
+                    team_status == 'PROGRESS' &&
+                    permission('courseSchedule/coursePostpone')
+                  "
+                  @click="signPostpone(scope.row)"
+                  >顺延课程</el-button
+                >
               </div>
             </template>
           </el-table-column>
@@ -150,12 +163,12 @@
             <div
               class="add"
               @click="studentResetVisiable = true"
-              v-if="permission('classGroup/mergeClassSplitClassAffirm')"
+              v-if="permission('classGroup/mergeClassSplitClassAffirm')&&team_status == 'PROGRESS'"
             >
               拆分班级
             </div>
           </div>
-          <div class="right">
+          <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>
@@ -795,6 +808,7 @@ export default {
       },
       bigin: this.beginDate(),
       options: this.processDate(),
+      team_status: "",
     };
   },
   created() {
@@ -810,6 +824,7 @@ export default {
     },
     async init() {
       this.teamid = this.$route.query.id;
+      this.team_status = this.$route.query.team_status;
       if (this.musicGroupInfo) {
         this.organId = this.musicGroupInfos.organId;
         this.chargeTypeId = this.musicGroupInfos.chargeTypeId;
@@ -1716,7 +1731,7 @@ export default {
         },
       };
     },
-       signPostpone (row) {
+    signPostpone(row) {
       this.activeClass = row.id;
       this.postponeVisible = true;
     },

+ 373 - 109
src/views/teamDetail/components/studentList.vue

@@ -19,127 +19,175 @@
         <span>{{ studentListInfo.courseRate }}</span>
       </statistic-item>
     </statistic> -->
-    <div class="topFunction">
+
+    <!-- style="margin-bottom: 15px" -->
+    <div class="studentListWrap" v-if="team_status == 'PROGRESS'">
       <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        "
-        v-if="
-          team_status == 'PAY' ||
-          team_status == 'APPLY' ||
-          team_status == 'PROGRESS' ||
-          team_status == 'PREPARE'
-        "
+        class="newBand"
+        v-permission="'studentRegistration/insertStudent'"
+        @click="createStudentFrom"
       >
-        <!-- <h2> -->
-        <!-- + '报名详情' -->
-        <!-- <el-page-header @back="onCancel" :content="teamName">
+        新增学员
+      </div>
+      <!-- 可以直接去学生考勤查看 -->
+      <!-- <el-button type="primary" v-permission="'/studentSignin'"
+              @click="gotoSignin">点名总览</el-button> -->
+      <div
+        class="newBand"
+        v-permission="'studentManage/queryStudentSubTotalCourseTimes'"
+        @click="viewTimer"
+        style="margin-right: 15px"
+      >
+        剩余时长明细
+      </div>
+    </div>
+    <div
+      style="display: flex; justify-content: space-between; align-items: center"
+      v-if="
+        team_status == 'PAY' ||
+        team_status == 'APPLY' ||
+        team_status == 'PROGRESS' ||
+        team_status == 'PREPARE'
+      "
+    >
+      <!-- <h2> -->
+      <!-- + '报名详情' -->
+      <!-- <el-page-header @back="onCancel" :content="teamName">
               </el-page-header> -->
-        <!-- </h2> -->
+      <!-- </h2> -->
 
-        <div
-          class="btnList"
-          style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
-        >
-          <!-- <div class='newBand close'
+      <div
+        class="btnList"
+        style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
+      >
+        <!-- <div class='newBand close'
                v-permission="'musicGroup/cancelMusicGroup'"
                @click="onClose">停止乐团</div>   v-show="status == 'APPLY'"-->
-          <div
-            class="newBand"
-            @click="payStart"
-            v-permission="'musicGroup/openPay'"
-            v-if="team_status == 'APPLY'"
-          >
-            开始缴费
-          </div>
-          <!-- v-show="status=='PAY'" -->
-          <div
-            class="newBand"
-            v-permission="'musicGroup/found'"
-            @click="onGoHome"
-            v-if="team_status == 'APPLY' || team_status == 'PAY'"
-          >
-            确认开团
-          </div>
-          <div
-            class="newBand"
-            v-permission="'musicGroup/extensionPayment'"
-            @click="extendTime(true)"
-            v-show="
-              team_status == 'PAY' ||
-              team_status == 'PROGRESS' ||
-              team_status == 'PREPARE'
-            "
-          >
-            延长缴费
-          </div>
-          <div
-            class="newBand"
-            v-permission="'musicGroup/extensionApplyExpireDate'"
-            @click="extendTime(false)"
-            v-show="
-              team_status == 'PAY' ||
-              team_status == 'APPLY' ||
-              team_status == 'PROGRESS' ||
-              team_status == 'PREPARE'
-            "
-          >
-            延长报名
-          </div>
-          <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
-          <div class="newBand" @click="onCreateQRCode('rePayment')">
-            报名链接(无乐器)
-          </div>
-          <div class="newBand" @click="onCreateQRCode('detail')">
-            报名缴费详情
-          </div>
-          <div
-            class="newBand"
-            v-permission="'musicGroup/addMusicGroupRegs'"
-            @click="mergeVisible = true"
-            v-show="team_status == 'PAY' || team_status == 'APPLY'"
-          >
-            合并学员
-          </div>
+        <div
+          class="newBand"
+          @click="payStart"
+          v-permission="'musicGroup/openPay'"
+          v-if="team_status == 'APPLY'"
+        >
+          开始缴费
         </div>
-        <p
-          style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
-          v-if="
+        <!-- v-show="status=='PAY'" -->
+        <div
+          class="newBand"
+          v-permission="'musicGroup/found'"
+          @click="onGoHome"
+          v-if="team_status == 'APPLY' || team_status == 'PAY'"
+        >
+          确认开团
+        </div>
+        <div
+          class="newBand"
+          v-permission="'musicGroup/extensionPayment'"
+          @click="extendTime(true)"
+          v-show="
+            team_status == 'PAY' ||
+            team_status == 'PROGRESS' ||
+            team_status == 'PREPARE'
+          "
+        >
+          延长缴费
+        </div>
+        <div
+          class="newBand"
+          v-permission="'musicGroup/extensionApplyExpireDate'"
+          @click="extendTime(false)"
+          v-show="
             team_status == 'PAY' ||
+            team_status == 'APPLY' ||
             team_status == 'PROGRESS' ||
             team_status == 'PREPARE'
           "
         >
-          报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
-            paymentExpireDate | formatTimer
-          }}
-        </p>
+          延长报名
+        </div>
+        <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
+        <div class="newBand" @click="onCreateQRCode('rePayment')">
+          报名链接(无乐器)
+        </div>
+        <div class="newBand" @click="onCreateQRCode('detail')">
+          报名缴费详情
+        </div>
+        <div
+          class="newBand"
+          v-permission="'musicGroup/addMusicGroupRegs'"
+          @click="mergeVisible = true"
+          v-show="team_status == 'PAY' || team_status == 'APPLY'"
+        >
+          合并学员
+        </div>
+        <el-popover placement="bottom" width="800" trigger="hover">
+          <div>
+            <el-table
+              style="width: 100% !important"
+              :data="leftList"
+              :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+            >
+              <el-table-column
+                label="乐团声部"
+                prop="subjectName"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                label="计划招生"
+                prop="expectedStudentNum"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <div>
+                    <p v-show="!isEdit">{{ scope.row.expectedStudentNum }}</p>
+
+                    <el-input
+                      v-show="isEdit"
+                      v-model.trim="scope.row.expectedStudentNum"
+                    ></el-input>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="已报名"
+                prop="applyStudentNum"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column label="已缴费" prop="payNum" align="center">
+              </el-table-column>
+            </el-table>
+            <div
+              class="btnWrap"
+              v-permission="'musicGroup/updateExpectedStudentNum'"
+              style="margin-right: 20px; margin-top: 20px"
+            >
+              <el-button v-show="!isEdit" @click="isEdit = true"
+                >编辑</el-button
+              >
+              <el-button v-show="isEdit" @click="saveIsEdit">保存</el-button>
+            </div>
+          </div>
+          <div class="newBand" style="margin-bottom: 10px" slot="reference">
+            声部报名计划
+          </div>
+        </el-popover>
       </div>
-    </div>
-    <div
-      style="margin-bottom: 15px"
-      class="studentListWrap"
-      v-if="team_status == 'PROGRESS'"
-    >
-      <el-button
-        type="primary"
-        v-permission="'studentRegistration/insertStudent'"
-        @click="createStudentFrom"
-        >新增学员</el-button
-      >
-      <!-- 可以直接去学生考勤查看 -->
-      <!-- <el-button type="primary" v-permission="'/studentSignin'"
-              @click="gotoSignin">点名总览</el-button> -->
-      <el-button
-        type="primary"
-        v-permission="'studentManage/queryStudentSubTotalCourseTimes'"
-        @click="viewTimer"
-        style="margin-right: 15px"
-        >剩余时长明细</el-button
+      <p
+        style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
+        v-if="
+          team_status == 'PAY' ||
+          team_status == 'PROGRESS' ||
+          team_status == 'PREPARE'
+        "
       >
+        报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
+          paymentExpireDate | formatTimer
+        }}
+      </p>
     </div>
+    <!--  -->
     <!-- 搜索类型 -->
     <save-form
       ref="searchForm"
@@ -308,7 +356,14 @@
         >
       </el-form-item>
     </save-form>
-
+    <div style="font-size: 14px; color: #f85043; padding-bottom: 10px">
+      在读人数:{{ studentListInfo.studying
+      }}<i style="width: 10px; display: inline-block"></i> 退团人数:{{
+        studentListInfo.quit
+      }}<i style="width: 10px; display: inline-block"></i> VIP&网管转化率:{{
+        studentListInfo.courseRate
+      }}<i style="width: 10px; display: inline-block"></i>
+    </div>
     <!-- 列表 -->
     <div class="tableWrap">
       <el-table
@@ -356,7 +411,14 @@
             <div>{{ scope.row.currentGrade + scope.row.currentClass }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="专业" prop="subjectName">
+              <el-table-column align="center" label="报名专业" prop="subjectName">
+          <template slot-scope="scope">
+            <copy-text>
+              {{ scope.row.regSubjectName }}
+            </copy-text>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="入团专业" prop="subjectName">
           <template slot-scope="scope">
             <copy-text>
               {{ scope.row.subjectName }}
@@ -923,6 +985,81 @@
       </div>
     </el-dialog>
     <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
+    <el-dialog
+      title="更改声部"
+      :visible.sync="changeVoiceVisible"
+      @close="closeChangeVoice"
+      :destroy-on-close="true"
+      width="600px"
+    >
+      <changeVoice
+        @close="closeChangeVoice"
+        @submited="getList"
+        :detail.sync="rowDetail"
+        :musicGroupId="teamid"
+        :voiceList="leftList"
+      />
+    </el-dialog>
+    <el-dialog title="订单详情" :visible.sync="orderVisible" width="600px" v-if="orderVisible">
+      <el-form :model="orderForm" :inline="true">
+        <!--     name: '',
+        totalAmount: '',
+        subject: '',
+        subjectFee: '',
+        axe: '',
+        axePrice: '',
+        others: '',
+        othersPrice: '' -->
+        <el-form-item label="学员姓名">
+          <el-input v-model.trim="orderForm.name" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="实缴金额">
+          <el-input v-model.trim="orderForm.totalAmount" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="实际专业">
+          <el-input v-model.trim="orderForm.subject" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="课程费用">
+          <el-input v-model.trim="orderForm.subjectFee" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="选择乐器">
+          <el-input v-model.trim="orderForm.axe" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="乐器价格">
+          <el-input v-model.trim="orderForm.axePrice" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="教辅组合">
+          <el-input v-model.trim="orderForm.others" disabled=""></el-input>
+        </el-form-item>
+        <el-form-item label="组合价格">
+          <el-input v-model.trim="orderForm.othersPrice" disabled=""></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button>取 消</el-button> -->
+        <el-button type="primary" @click="orderVisible = false"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+       <el-dialog title="修改专业" :visible.sync="subjectVisible" width="400px">
+      <el-form :model="maskSoundForm">
+        <el-form-item label="选择专业">
+          <el-select v-model.trim="maskSoundForm.subject" filterable clearable>
+            <el-option
+              v-for="(item, index) in soundList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="subjectVisible = false">取 消</el-button>
+        <el-button type="primary" @click="okReset">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -946,11 +1083,16 @@ import {
   extensionApplyExpire,
   getTeamBaseInfo,
   findUserByRole,
+  getintoClass,
+  resetPlanNum,
+
 } from "@/api/buildTeam";
 import {
   addStudent,
   getStudentClass,
   getStudentInfoByPhone,
+    getStudentFeeDetail,
+    resetStudentSubject
 } from "@/api/studentManager";
 import qrCode from "@/components/QrCode/index";
 import { getOrganizationCourseUnitPriceSettings } from "@/api/specialSetting";
@@ -968,6 +1110,8 @@ 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";
+//import changeVoice from "./modals/change-voice";
 import visit from "@/views/withdrawal-application/modals/visit";
 export default {
   name: "tstudentList",
@@ -1173,6 +1317,25 @@ export default {
       codeStatus: false,
       qrCodeUrl: null,
       codeTitle: null,
+      isEdit: false,
+      leftList: [],
+      changeVoiceVisible: false,
+      rowDetail: null,
+      orderVisible: false,
+      orderForm: {
+        name: "",
+        totalAmount: "",
+        subject: "",
+        subjectFee: "",
+        axe: "",
+        axePrice: "",
+        others: "",
+        othersPrice: "",
+      },
+      maskSoundForm:{
+          subject: "",
+      },
+      subjectVisible:false
     };
   },
   components: {
@@ -1184,6 +1347,7 @@ export default {
     paymentList,
     visit,
     qrCode,
+    changeVoice,
   },
   created() {},
   filters: {
@@ -1256,6 +1420,12 @@ export default {
         }
       });
 
+      getintoClass({ musicGroupId: this.teamid }).then((res) => {
+        if (res.code == 200) {
+          this.leftList = res.data;
+        }
+      });
+
       // getSubject().then(res => {
       //   if (res.code == 200) {
       //     this.soundList = res.data;
@@ -2011,6 +2181,98 @@ export default {
           vaildStudentUrl() + "/#/login?musicGroupId=" + id + "&instrument=1";
       }
     },
+    saveIsEdit() {
+      // 提交数据
+      this.isEdit = false;
+      resetPlanNum(this.leftList).then((res) => {});
+    },
+    openChangeVoice(row) {
+      console.log(row);
+      // this.getList().then((res) => {
+      //   for (const item of res.data.rows) {
+      //     if (item.id === row.id) {
+      //       this.rowDetail = { ...item };
+      //       this.changeVoiceVisible = true;
+      //            console.log( this.rowDetail)
+      //     }
+      //   }
+      // });
+      this.rowDetail = { ...row, studentId: row.userId };
+      this.changeVoiceVisible = true;
+    },
+    closeChangeVoice() {
+      this.changeVoiceVisible = false;
+      // this.rowDetail = null
+    },
+    lookdetail(row) {
+      this.orderVisible = true;
+      this.activeId = row.userId;
+      this.orderForm.name = row.realName;
+      this.orderForm.subject = row.subjectName;
+      getStudentFeeDetail({
+        musicGroupId: this.teamid,
+        studentId: row.userId,
+      }).then((res) => {
+        if (res.code == 200) {
+          if (res.data) {
+            this.orderForm.totalAmount = res.data.totalAmount;
+            // this.orderForm.subjectFee = res.data.courseFee;
+            let goodStr = "";
+            let goodPrice = 0;
+            let otherStr = "";
+            let othersPrice = 0;
+            for (let i in res.data.goods) {
+              if (res.data.goods[i].goodsType == "INSTRUMENT") {
+                goodStr += res.data.goods[i].goodsName + ",";
+                goodPrice += parseFloat(res.data.goods[i].musicalFee);
+                // this.orderForm.axe = res.data.goods[i].goodsName;
+                // this.orderForm.axePrice = res.data.goods[i].musicalFee;
+              } else if (res.data.goods[i].goodsType == "ACCESSORIES") {
+                otherStr += res.data.goods[i].goodsName + ",";
+                othersPrice += parseFloat(res.data.goods[i].musicalFee);
+                // this.orderForm.others = res.data.goods[i].goodsName;
+                // this.orderForm.othersPrice = res.data.goods[i].musicalFee;
+              } else if (res.data.goods[i].goodsType == "COURSE") {
+                this.orderForm.subjectFee = res.data.goods[i].musicalFee;
+              }
+            }
+            this.orderForm.others = otherStr.substring(0, otherStr.length - 1);
+            this.orderForm.othersPrice = othersPrice;
+            this.orderForm.axe = goodStr.substring(0, goodStr.length - 1);
+            this.orderForm.axePrice = goodPrice;
+          }
+        }
+      });
+    },
+        // 修改专业
+    resetSubject(row) {
+      this.activeId = row.userId;
+      this.subjectVisible = true;
+      //   resetStudentSubject().then(res=>{]})
+    },
+        okReset() {
+      if (!this.maskSoundForm.subject) {
+        this.$message.error("请选择调剂专业");
+        return;
+      }
+      resetStudentSubject({
+        musicGroupId: this.teamid,
+        userId: this.activeId,
+        subId: this.maskSoundForm.subject,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("修改成功");
+          this.subjectVisible = false;
+          this.maskForm.subject = "";
+          getintoClass({ musicGroupId: this.id }).then((res) => {
+            if (res.code == 200) {
+              this.leftList = res.data;
+            }
+          });
+          this.getList();
+        }
+      });
+    },
   },
   watch: {
     quitVisible(val) {
@@ -2178,8 +2440,10 @@ export default {
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
-  height: 36px;
   align-items: center;
+  div {
+    margin-right: 15px;
+  }
 }
 
 .btnList {

+ 33 - 138
src/views/teamDetail/teamList.vue

@@ -198,51 +198,39 @@
           >
             <template slot-scope="scope">
               <div>
-                <!-- <el-button type="text"
-                           v-if="scope.row.status == 'PREPARE' && permission('/setImprovement')"
-                           @click="gotoImprovement(scope.row)">基础技能班</el-button> -->
-                <!-- <el-button
+                <!-- 审核中 编辑 -->
+                <el-button
                   type="text"
-                  v-if="
-                    scope.row.status == 'PREPARE' &&
-                    permission('/teamDetailedList')
-                  "
-                  @click="gotodetailList(scope.row)"
-                  >发放清单</el-button
-                > -->
-
-                <!-- <el-button type="text"
-                           v-if="scope.row.status == 'PREPARE'"
-                           @click="lookTeamCourse(scope.row)">查看课表</el-button> -->
-
-                <!-- 报名中&缴费中 查看 -->
-                <!-- <el-button
+                  v-if="scope.row.status == 'AUDIT' && permission('/teamAudit')"
+                  @click="lookTeamDetail(scope.row)"
+                  >审核</el-button
+                >
+                <el-button
                   type="text"
-                  v-if="
-                    (scope.row.status == 'APPLY' ||
-                      scope.row.status == 'PAY') &&
-                    permission('/signupList')
-                  "
+                  v-if="scope.row.status == 'DRAFT' && permission('/teamDraft')"
                   @click="lookTeamDetail(scope.row)"
-                  >查看</el-button
-                > -->
-
-                <!-- <el-button
+                  >编辑</el-button
+                >
+                          <!-- 审核失败 编辑 -->
+                <el-button
                   type="text"
                   v-if="
-                    (scope.row.status == 'PREPARE' ||
-                      scope.row.status == 'PROGRESS') &&
-                    permission('/remedy') &&
-                    scope.row.isRemedy
+                    scope.row.status == 'AUDIT_FAILED' &&
+                    permission('/auditFailed')
                   "
-                  @click="gotoSigin(scope.row)"
-                  >乐团补招</el-button
-                > -->
+                  @click="lookTeamDetail(scope.row)"
+                  >编辑</el-button
+                >
                 <!-- 报名中缴费中筹备中查看乐团 -->
                 <el-button
                   type="text"
                   v-if="
-                    (scope.row.status == 'APPLY' ||
+                    ( scope.row.status == 'PRE_APPLY'||
+                       scope.row.status == 'PAUSE'||
+                       scope.row.status == 'PRE_BUILD_FEE'||
+                      scope.row.status == 'PROGRESS'||
+                       scope.row.status == 'CANCELED'||
+                      scope.row.status == 'APPLY' ||
                       scope.row.status == 'PAY' ||
                       scope.row.status == 'PREPARE' ||
                         scope.row.status == 'CLOSE' ||
@@ -278,80 +266,7 @@
                   >查看</el-button
                 > -->
 
-                <!-- 预报名中 查看 -->
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'PRE_APPLY' &&
-                    permission('studentRegistration/queryPreApplyList')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >查看</el-button
-                >
-
-                <!-- 暂停中 查看 -->
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'PAUSE' &&
-                    permission('musicGroup/pauseMusicGroup/look')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >详情</el-button
-                >
-
-                <!-- 创建缴费中 查看 -->
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'PRE_BUILD_FEE' &&
-                    permission('/createPayment')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >详情</el-button
-                >
 
-                <!-- <el-button type="text"
-                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE' && scope.row.status != 'APPLY'&& scope.row.status != 'PAY'"
-                           @click="lookTeamDetail(scope.row)">编辑</el-button> -->
-                <!-- 筹备中 编辑 -->
-                <!-- <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'PREPARE' &&
-                    permission('teamDetail/teamSeting/update')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >班级列表</el-button
-                > -->
-                <!-- 审核中 编辑 -->
-                <el-button
-                  type="text"
-                  v-if="scope.row.status == 'AUDIT' && permission('/teamAudit')"
-                  @click="lookTeamDetail(scope.row)"
-                  >审核</el-button
-                >
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'CANCELED' &&
-                    permission('teamDetail/audit/update')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >详情</el-button
-                >
-                <!-- teamCanceled -->
-                <!-- 费用审核中  -->
-                <!-- <el-button type="text"
-                           v-if="( scope.row.status == 'FEE_AUDIT')&& permission('teamDetail/audit/update')"
-                           @click="lookTeamDetail(scope.row)">查看</el-button> -->
-                <!-- 编辑中 编辑 -->
-                <el-button
-                  type="text"
-                  v-if="scope.row.status == 'DRAFT' && permission('/teamDraft')"
-                  @click="lookTeamDetail(scope.row)"
-                  >编辑</el-button
-                >
                 <el-button
                   type="text"
                   v-if="
@@ -365,16 +280,7 @@
                   @click="stopTeam(scope.row)"
                   >取消乐团</el-button
                 >
-                <!-- 审核失败 编辑 -->
-                <el-button
-                  type="text"
-                  v-if="
-                    scope.row.status == 'AUDIT_FAILED' &&
-                    permission('/auditFailed')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  >编辑</el-button
-                >
+
 
                 <el-button
                   v-if="
@@ -406,15 +312,7 @@
                   type="text"
                   >暂停</el-button
                 >
-                <el-button
-                  v-if="
-                    scope.row.status == 'PROGRESS' &&
-                    permission('/resetTeaming')
-                  "
-                  @click="lookTeamDetail(scope.row)"
-                  type="text"
-                  >详情</el-button
-                >
+
                 <el-button
                   v-if="
                     scope.row.status == 'CANCELED' &&
@@ -572,16 +470,13 @@ export default {
     createNewTeam() {
       this.$store.dispatch("buildIndex", 0);
       this.$store.dispatch("delVisitedViews", { path: "/business/teamBuild" });
-
-      this.$router.push(
-        {
-          path: "/business/teamBuild",
-          query: { type: "newTeam", clear: "true" },
-        },
-        (router) => {
-          router.meta.title = "新建乐团";
-        }
-      );
+    this.$router.push({
+            path: "/business/resetTeaming",
+              query: { type: "newTeam"}},
+            (router) => {
+              router.meta.title = "新建乐团";
+            }
+          );
     },
 
     resetTeam() {
@@ -888,7 +783,7 @@ export default {
              type:'resetTeam',
               team_status:row.status
             },
-            
+
           }, (router) => {
               router.meta.title = "乐团进行中";
             });