版本提交

1

src/layout/components/AppMain.vue

@@ -1,35 +1,36 @@
 <template>
   <section class="app-main">
     <!--   -->
-    <transition name="fade-transform"
-                mode="out-in">
-      <keep-alive v-if="needKeep">
-        <router-view :key="key" />
-      </keep-alive>
-      <router-view v-else :key="key" />
+    <transition name="fade-transform" mode="out-in">
+      <div>
+        <keep-alive>
+          <router-view :key="key" v-if="needKeep" />
+        </keep-alive>
+        <router-view v-if="!needKeep" :key="key" />
+      </div>
     </transition>
   </section>
 </template>
 
 <script>
-import notKeepAliveList from '@/router/notKeepAliveList'
+import notKeepAliveList from "@/router/notKeepAliveList";
 export default {
-  name: 'AppMain',
+  name: "AppMain",
   computed: {
-    key () {
-      return this.$route.path
+    key() {
+      return this.$route.path;
     },
     needKeep() {
-      return !notKeepAliveList.includes(this.$route.path)
+      return !notKeepAliveList.includes(this.$route.path);
     },
-    cachedViews () {
-      return this.$store.state.tagsView.cachedViews
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews;
     },
-    keep () {
-      return this.$route.meta.noCache
-    }
-  }
-}
+    keep() {
+      return this.$route.meta.noCache;
+    },
+  },
+};
 </script>
 
 <style scoped>

src/router/index.js

@@ -158,8 +158,11 @@ export const asyncRoutes = {
   payAppeal: () => import('@/views/workBenchManager/payAppeal'),
   // 乐团管理
   teamDetail: () => import('@/views/teamDetail/teamList'),
-  teamBuild: () => import('@/views/teamBuild/index'),
-  teamDraft:() => import('@/views/teamBuild/index'),
+  teamBuild: () => import('@/views/teamBuild/index'), // 新建
+  teamDraft:() => import('@/views/teamBuild/teamDraft'), // 编辑
+  teamAudit:() => import('@/views/teamBuild/teamDraft'), // 审核
+  feeAudit:() => import('@/views/teamBuild/teamDraft'), // 费用审核
+  auditFailed:() => import('@/views/teamBuild/index'), // 审核失败
   forecastName: () => import('@/views/teamBuild/forecastName'), // 预报名页面
   createPayment: () => import('@/views/teamBuild/createPayment'), // 创建缴费页面
   // VIP管理

src/router/notKeepAliveList.js

@@ -71,7 +71,6 @@ export default [
   '/orderList/payRecord', // 支出记录
   '/orderList/businessStatement', // 经营报表
   '/business/buildVip', // 新建vip
-  '/orderList/businessStatement', // 经营报表
   '/orderList/resetList', // 更换列表
   '/orderList/incomeOut', // 对外订单管理
   '/business/signupList', // 报名缴费
@@ -90,5 +89,6 @@ export default [
   '/arrearage-students',
   '/business/strudentPayInfo',
   '/timedTask/timedTask',
-  '/business/teamDraft'
+  '/business/teamAudit',
+  '/business/feeAudit',
 ]

src/store/getters.js

@@ -14,6 +14,7 @@ const getters = {
   phone: state => state.user.phone,
   newStudentinfo: state => state.buildTeam.newStudentList,
   reactClassStudentList:state=>state.reactClassStudent.classList ,
-  buildIndex:state=>state.buildTeam.buildIndex
+  buildIndex:state=>state.buildTeam.buildIndex,
+  draftIndex:state=>state.buildTeam.draftIndex
 }
 export default getters

src/store/modules/buildTeam.js

@@ -3,7 +3,8 @@ const state = {
   checkinfo: {},
   payList: {},
   newStudentList: {},
-  buildIndex:''
+  buildIndex:'',
+  draftIndex:''
 }
 
 const mutations = {
@@ -21,8 +22,12 @@ const mutations = {
   },
   SET_BUILD_INDEX(state,buildIndex){
     state.buildIndex = buildIndex
+  },
+  SET_DRAFT_INDEX(state,draftIndex){
+    state.draftIndex = draftIndex
   }
 
+
 }
 const actions = {
   topinfo ({ commit }, topinfo) {
@@ -39,6 +44,9 @@ const actions = {
   },
   buildIndex({commit},buildIndex){
     commit('SET_BUILD_INDEX', buildIndex)
+  },
+  draftIndex({commit},draftIndex){
+    commit('SET_DRAFT_INDEX', draftIndex)
   }
 }
 export default {

src/store/modules/tagsView.js

@@ -31,10 +31,13 @@ const tagsView = {
     },
     DEL_VISITED_VIEWS: (state, view) => {
       for (const [i, v] of state.visitedViews.entries()) {
+
         if (v.path === view.path) {
+
           if (state.visitedViews.length == 1 && state.visitedViews[0].path == '/main/main') {
             break
           } else {
+
             state.visitedViews.splice(i, 1)
             break
           }

src/views/setSilder/addSilder.vue

@@ -305,7 +305,6 @@ export default {
           name: '根结点',
           children: []
         })
-        console.log(this.cascaderList)
       })
     },
     setTableData (result) {

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

@@ -120,12 +120,36 @@ export default {
       teamStatus: "", // 乐团状态
       checkList: [],
       basdisabled: false,
+      teamid:''
     };
   },
   mounted() {
+      if(this.$route.query.id){
+       this.teamid = this.$route.query.id;
+    }
     this.init();
   },
   activated() {
+    if(this.teamid&&this.teamid != this.$route.query.id){
+      this.init()
+    }else{
+      if(this.activeSoundList.length <1 ){
+         this.init()
+      }
+    }
+      this.teamStatus = this.$route.query.type;
+     if (
+        this.teamStatus == "look" ||
+        this.teamStatus == "teamAudit" ||
+        this.teamStatus == "feeAudit"
+      ) {
+        this.basdisabled = true;
+      } else {
+        this.basdisabled = false;
+      }
+  },
+  deactivated(){
+    this.activeSoundList = []
   },
   methods: {
     init() {
@@ -134,12 +158,6 @@ export default {
       let type = this.topfor.type;
       let section = this.topfor.section;
       this.teamStatus = this.$route.query.type;
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules;
-      }
       if (
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
@@ -224,7 +242,6 @@ export default {
                       }
                     });
                   }
-                  // console.log(this.activeSoundList);
                 }
               );
             }
@@ -370,7 +387,6 @@ export default {
         // 格式化商品数据 chioseMusic: [{ musical: '', type: ["GROUP"], groupPrice: 0, borrowPrice: 1500 }],
 
         active.chioseMusic.forEach((music) => {
-          // console.log(music);
           let goodsItem = null;
           let depositFee = music.borrowPrice;
           let price = music.groupPrice;
@@ -506,7 +522,13 @@ export default {
         this.$message.error("请至少勾选一个");
         return;
       }
-      for (let i = 0; i < this.activeSoundList.length; i++) {
+         this.$confirm("确定删除选中声部?", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    })
+      .then(() => {
+        for (let i = 0; i < this.activeSoundList.length; i++) {
         let index = this.checkList.indexOf(this.activeSoundList[i].id);
         if (index != -1) {
           this.activeSoundList.splice(i, 1);
@@ -515,6 +537,12 @@ export default {
         }
       }
       this.checkList = [];
+      this.$message.success('删除成功')
+      })
+      .catch(() => { });
+
+
+
     },
     allin() {
       this.checkList = [];

src/views/teamBuild/components/teamBaseInfo.vue

@@ -3,7 +3,7 @@
     <div class="banseLeft">
       <div class="head">乐团基本信息：</div>
       <!-- <div class="num">乐团编号：dywh01</div> -->
-      <save-form
+      <el-form
         :model="topFrom"
         :inline="true"
         ref="topinfo"
@@ -70,28 +70,37 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教学地点"
-                      prop="address"
-                      :rules="[{ required: true, message: '教学地点不能为空' }]">
+        <el-form-item
+          label="教学地点"
+          prop="address"
+          :rules="[{ required: true, message: '教学地点不能为空' }]"
+        >
           <template #label>
-            <p style="position: relative; display: inline-block;"> 教学地点
+            <p style="position: relative; display: inline-block">
+              教学地点
               <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    如果已生成课表，则会修改未上课时的教学点
-                  </div>
-                  <i class="el-icon-question"
-                     style="font-size: 18px; color: #F56C6C"></i>
-                </el-tooltip>
+                <div slot="content">
+                  如果已生成课表，则会修改未上课时的教学点
+                </div>
+                <i
+                  class="el-icon-question"
+                  style="font-size: 18px; color: #f56c6c"
+                ></i>
+              </el-tooltip>
             </p>
           </template>
-          <el-select v-model.trim="topFrom.address"
-                     filterable
-                     clearable
-                     :disabled="!topFrom.section || basdisabled">
-            <el-option v-for="(item, index) in addList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+          <el-select
+            v-model.trim="topFrom.address"
+            filterable
+            clearable
+            :disabled="!topFrom.section || basdisabled"
+          >
+            <el-option
+              v-for="(item, index) in addList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -288,7 +297,7 @@
             修改【收费类型】会重置乐团声部与缴费信息
           </p>
         </el-form-item>
-      </save-form>
+      </el-form>
       <div class="btnWrap">
         <div
           class="nextBtn"
@@ -302,18 +311,13 @@
           修改
         </div>
         <!-- 审批或者草稿的下一步 -->
-        <div
-          class="nextBtn"
-          @click="gotoNext(1)"
-          v-if="showNext"
-        >
-          下一步
-        </div>
+        <div class="nextBtn" @click="gotoNext(1)" v-if="showNext">下一步</div>
       </div>
     </div>
   </div>
 </template>
 <script>
+import merge from "webpack-merge";
 import {
   getSection,
   getType,
@@ -465,11 +469,49 @@ export default {
   },
   created() {},
   mounted() {
+    if (this.$route.query.id) {
+      this.teamid = this.$route.query.id;
+    }
+    if (this.$route.query.type == "newTeam") {
+      this.onReset();
+    }
+ console.log(this.$route.query)
     this.init();
-    this.$forceUpdate();
-    // 获取分部下的员工
+    // this.$forceUpdate();
+  },
+  activated() {
+     console.log(this.$route.query.type)
+    // console.log('直接进编辑')
+    if (this.teamid && this.teamid != this.$route.query.id) {
+      this.init();
+    }
+    if (this.$route.query.clear == 'true') {
+
+      this.onReset();
+        this.$router.push({
+      query: merge(this.$route.query, { clear: false }),
+    });
+    }
+    if (this.teamStatus == "newTeam") {
+      this.$store.dispatch("buildIndex", 0);
+    }
+
+    if (this.teamStatus != "newTeam") {
+      this.$store.dispatch("draftIndex", 0);
+    }
+      this.teamStatus = this.$route.query.type;
+
+      if (
+        this.teamStatus == "look" ||
+        this.teamStatus == "teamAudit" ||
+        this.teamStatus == "feeAudit"
+      ) {
+        this.basdisabled = true;
+      } else {
+        this.basdisabled = false;
+      }
   },
-  beforeDestroy() {},
+
   methods: {
     //|| this.teamStatus === 'teamAudit'
     isNotEditing: function () {
@@ -479,9 +521,7 @@ export default {
         this.teamStatus === "teamList"
       );
     },
-    changeFeeType(val) {
-      // console.log(val == "ONLINE");
-    },
+    changeFeeType(val) {},
     changePaymentValidStartDate(val) {
       if (val) {
         this.$set(this.topFrom, "paymentValidEndDate", "");
@@ -506,30 +546,36 @@ export default {
         },
       };
     },
-  init() {
+    init() {
       this.isInit = true;
-      this.$store.dispatch('buildIndex',0)
+
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
       //          2. newTeam  新建乐团
       //          3.teamList  跨团修改
       //          4.teamDraft 乐团草稿
       this.teamStatus = this.$route.query.type;
+      if (this.teamStatus == "newTeam") {
+        this.$store.dispatch("buildIndex", 0);
+      }
+
+      if (this.teamStatus != "newTeam") {
+        this.$store.dispatch("draftIndex", 0);
+      }
       // 传过来的乐团信息
       this.activeTeam = this.getTeamList;
       if (
+
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
         this.teamStatus == "feeAudit"
-
       ) {
+
         this.basdisabled = true;
       } else {
         this.basdisabled = false;
       }
-      if (
-        this.$route.query.id
-      ) {
+      if (this.$route.query.id) {
         // 单团修改
         this.teamid = this.$route.query.id;
         getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
@@ -610,34 +656,8 @@ export default {
           }
         });
       } else {
-        // this.topFrom = {
-        //   type: "", // 收费类型
-        //   section: "", //所属分部
-        //   school: "", // 合作单位
-        //   courseViewType: "",
-        //   teacher: "", // 乐团主管
-        //   name: "", //乐团名称
-        //   boss: "", // 运营主管
-        //   time: "", // 报名截止时间
-        //   startClass: [], // 招生年级起始
-        //   paymentValid: [], // 缴费有效期时间起始
-        //   address: "", // 教学地点
-        //   salary: "", // 收费模式
-        //   head: "",
-        //   paymentPattern: "", // 缴费方式
-        //   isClass: false, //是否为课堂课
-        //   startTime: "",
-        //   ownershipType: "OWN", // 合作机构类型
-        //   feeType: null,
-        // };
-        // this.$refs["topinfo"].resetFields();
       }
-      // 1.获取各个选项卡的数据内容
-      // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {
-      //   if (res.code == 200) {
-      //     this.sectionList = res.data.rows;
-      //   }
-      // }).catch()
+
       getEmployeeOrgan().then((res) => {
         if (res.code == 200) {
           this.sectionList = res.data;
@@ -650,7 +670,6 @@ export default {
         }
       });
       // 缓存设置时的状态
-      sessionStorage.setItem("resetCode", "1");
     },
     changeSection(val) {
       // 修改分部的时候 重置运营主管 重置乐团主管 重置乐队指导 合作单位  教学点
@@ -685,7 +704,7 @@ export default {
       });
     },
     chioseSchool(val) {},
-     gotoNext(num) {
+    gotoNext(num) {
       this.$refs["topinfo"].validate((valid, object) => {
         if (!valid) {
           this.$message.error("请填写建团必要参数");
@@ -705,7 +724,6 @@ export default {
       });
     },
     resetSubmit() {
-
       this.$refs["topinfo"].validate((valid, object) => {
         if (!valid) {
           this.$message.error("请填写必要参数");
@@ -791,6 +809,29 @@ export default {
       // this.topFrom.paymentValidStartDate = ''
       // this.topFrom.paymentValidEndDate = ''
     },
+    onReset() {
+      this.topFrom = {
+        type: "", // 收费类型
+        section: "", //所属分部
+        school: "", // 合作单位
+        courseViewType: "",
+        teacher: "", // 乐团主管
+        name: "", //乐团名称
+        boss: "", // 运营主管
+        time: "", // 报名截止时间
+        startClass: [], // 招生年级起始
+        paymentValid: [], // 缴费有效期时间起始
+        address: "", // 教学地点
+        salary: "", // 收费模式
+        head: "",
+        paymentPattern: "", // 缴费方式
+        isClass: false, //是否为课堂课
+        startTime: "",
+        ownershipType: "OWN", // 合作机构类型
+        feeType: null,
+      };
+      this.$refs["topinfo"].resetFields();
+    },
   },
   computed: {
     startClassString() {
@@ -806,15 +847,14 @@ export default {
         .join(",");
     },
     showNext() {
-      const teamStatus = this.teamStatus
-      // console.log(teamStatus)
+      const teamStatus = this.teamStatus;
       return (
-        teamStatus == 'newTeam' ||
-        teamStatus == 'teamDraft' ||
-        teamStatus == 'teamAudit' ||
-        teamStatus == 'feeAudit'
-      )
-    }
+        teamStatus == "newTeam" ||
+        teamStatus == "teamDraft" ||
+        teamStatus == "teamAudit" ||
+        teamStatus == "feeAudit"
+      );
+    },
   },
 };
 </script>

src/views/teamBuild/components/teamSoundSet.vue

@@ -60,22 +60,11 @@
   </div>
 </template>
 <script>
-import store from "@/store";
-import { formatData } from "@/utils/utils";
 import {
-  getSubject,
-  getDefaultSubject,
-  getGoods,
-  createTeam,
-  getSoundTree,
-  findMusicGroupSubjectInfo,
-  updateSubjectInfo,
   auditSuccess,
   auditFailed,
-  getSubjectGoods,
 } from "@/api/buildTeam";
 import dayjs from "dayjs";
-
 import soundSetCore from "./soundSetComponents/soundSetCore";
 
 export default {
@@ -93,20 +82,26 @@ export default {
     };
   },
   mounted () {
-    // console.log(this)
     this.teamid = this.$route.query.id;
     this.teamStatus = this.$route.query.type;
-     this.$store.dispatch('buildIndex',1)
+      if (this.teamStatus == "newTeam") {
+        this.$store.dispatch('buildIndex',1)
+      }
+      if(this.teamStatus != "newTeam"){
+         this.$store.dispatch('draftIndex',1)
+      }
+
   },
   activated () {
+
     this.teamid = this.$route.query.id;
     this.teamStatus = this.$route.query.type;
   },
   methods: {
     handleClick(evt) {
-      // console.log(evt)
     },
     goback () {
+
       this.$emit("chiosetab", 0);
     },
     submitInfo () {

src/views/teamBuild/index.vue

@@ -29,17 +29,6 @@
                alt=""
                class="arrow" />
         </span>
-        <!--  @click="activeIndex = 2" -->
-        <!-- <span class="stepspan stepspan3"
-              v-if="showFlag?activeIndex  >=  2:true">
-          <div class="step2 sptep"
-               :class="activeIndex  >=  2 ? 'activestep' : ''">
-            创建缴费
-          </div>
-          <img :src="activeIndex >= 2 ? stepImgs.nol : stepImgs.active"
-               alt=""
-               class="arrow" />
-        </span> -->
       </div>
 
       <!-- 下面显示的内容 -->
@@ -50,16 +39,11 @@
                         :getTeamList="getTeamList"
                         @getBaseInfo="getBaseInfo" />
         </div>
-        <div v-show="activeIndex == 1">
+        <div v-show="activeIndex == 1" v-if="showSecond">
           <teamSoundMoney @chiosetab="chiosetab"
                           :getTeamList="getTeamList"
                           @getBaseInfo="getBaseInfo" />
         </div>
-        <!-- <div v-if="activeIndex == 2">
-          <teamPayInfo @chiosetab="chiosetab"
-                       :getTeamList="getTeamList"
-                       :baseInfo="baseInfo" />
-        </div> -->
       </div>
     </div>
   </div>
@@ -81,6 +65,7 @@ export default {
       pageName: "建团申请",
       getTeamList: [],
       teamStatus: "",
+      showSecond:false
     };
   },
   created () {
@@ -89,7 +74,10 @@ export default {
     this.init();
   },
   activated () {
-    // this.init();
+    this.init();
+  },
+  deactivated(){
+ this.showSecond=false
   },
   methods: {
     init () {
@@ -101,19 +89,18 @@ export default {
       if (this.teamStatus == "newTeam") {
         // 新建团
         this.pageName = "建团申请";
-        // this.activeIndex = 0;
+         this.activeIndex = this.$store.getters.buildIndex || 0
       } else {
         this.pageName = "乐团修改";
-        // this.activeIndex = 0;
+        this.activeIndex = this.$store.getters.draftIndex || 0
       }
-      this.activeIndex = this.$store.getters.buildIndex || 0
-      console.log(this.$store.getters.buildIndex)
     },
     chiosetab (val) {
       this.activeIndex = val;
       if (val == 0 && this.teamStatus != "newTeam" || val == 0 && this.teamStatus != "feeAudit") {
         this.$refs.teamBaseInfo.init()
       }
+      this.showSecond = true;
     },
     goBack () {
       this.$store.dispatch('delVisitedViews', this.$route)

src/views/teamBuild/teamDraft.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="m-container">
+    <div class="line"></div>
+    <h2>
+      <el-page-header @back="goBack"
+                      :content="pageName"> </el-page-header>
+    </h2>
+    <div class="m-core">
+      <div class="stepbox">
+        <!--  @click="activeIndex = 0" -->
+        <span class="stepspan stepspan1">
+          <div class="step1 sptep"
+               :class="activeIndex >= 0 ? 'activestep' : ''">
+            基本信息
+          </div>
+          <img :src="activeIndex  >=  0 ? stepImgs.nol : stepImgs.active"
+               alt=""
+               class="arrow" />
+        </span>
+        <!-- @click="activeIndex = 1" -->
+        <span class="stepspan stepspan2"
+              v-if="showFlag?activeIndex>= 1:true">
+          <!--    -->
+          <div class="step2 sptep"
+               :class="activeIndex  >= 1 ? 'activestep' : ''">
+            声部设置
+          </div>
+          <img :src="activeIndex >=  1 ? stepImgs.nol : stepImgs.active"
+               alt=""
+               class="arrow" />
+        </span>
+        <!--  @click="activeIndex = 2" -->
+        <!-- <span class="stepspan stepspan3"
+              v-if="showFlag?activeIndex  >=  2:true">
+          <div class="step2 sptep"
+               :class="activeIndex  >=  2 ? 'activestep' : ''">
+            创建缴费
+          </div>
+          <img :src="activeIndex >= 2 ? stepImgs.nol : stepImgs.active"
+               alt=""
+               class="arrow" />
+        </span> -->
+      </div>
+
+      <!-- 下面显示的内容 -->
+      <div class="stepcontent">
+        <div v-show="activeIndex == 0">
+          <teamBaseInfo @chiosetab="chiosetab"
+                        ref='teamBaseInfo'
+                        :getTeamList="getTeamList"
+                        @getBaseInfo="getBaseInfo" />
+        </div>
+        <div v-show="activeIndex == 1" >
+          <teamSoundMoney @chiosetab="chiosetab"
+                          :getTeamList="getTeamList"
+                          @getBaseInfo="getBaseInfo" />
+        </div>
+        <!-- <div v-if="activeIndex == 2">
+          <teamPayInfo @chiosetab="chiosetab"
+                       :getTeamList="getTeamList"
+                       :baseInfo="baseInfo" />
+        </div> -->
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import teamBaseInfo from "@/views/teamBuild/components/teamBaseInfo";
+import teamSoundMoney from "@/views/teamBuild/components/teamSoundSet";
+import teamPayInfo from "@/views/teamBuild/components/teamPayInfo";
+export default {
+  components: { teamBaseInfo, teamSoundMoney, teamPayInfo },
+  name: "teamBuild",
+  data () {
+    return {
+      activeIndex: 0,
+      stepImgs: {
+        nol: require("@/assets/images/base/step-arrow-active.png"),
+        active: require("@/assets/images/base/step-arrow.png"),
+      },
+      pageName: "建团申请",
+      getTeamList: [],
+      teamStatus: "",
+    };
+  },
+  created () {
+    // 判断 是新建乐团还是修改乐团
+    // this.activeIndex = 0;
+    this.init();
+  },
+  activated () {
+    this.init();
+  },
+  methods: {
+    init () {
+      this.teamStatus = this.$route.query.type;
+      if (this.$route.query.teamList) {
+        this.getTeamList = this.$route.query.teamList;
+      }
+
+      if (this.teamStatus == "newTeam") {
+        // 新建团
+        this.pageName = "建团申请";
+          this.activeIndex = this.$store.getters.buildIndex || 0
+      } else {
+        this.pageName = "乐团修改";
+       this.activeIndex = this.$store.getters.draftIndex || 0
+      }
+    },
+    chiosetab (val) {
+      this.activeIndex = val;
+      if (val == 0 && this.teamStatus != "newTeam" || val == 0 && this.teamStatus != "feeAudit") {
+        this.$refs.teamBaseInfo.init()
+      }
+    },
+    goBack () {
+      this.$store.dispatch('delVisitedViews', this.$route)
+      this.$router.push({
+        path: "/business/teamDetail",
+      });
+    },
+    getBaseInfo (baseInfo) {
+      this.baseInfo = baseInfo
+      this.pageName = baseInfo.musicGroup?.name
+    },
+  },
+  computed: {
+    showFlag () {
+      return (this.teamStatus == 'newTeam' || this.teamStatus == 'teamList')
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.stepbox {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  .stepspan {
+    font-size: 14px;
+    display: block;
+    line-height: 40px;
+    position: relative;
+    z-index: 100;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+
+    .sptep {
+      width: 110px;
+      height: 40px;
+      border: 1px solid #dcdfe6;
+      border-right: none;
+      border-bottom: none;
+      padding-left: 25px;
+      border-radius: 4px 0 0 0;
+    }
+    .arrow {
+      height: 40px;
+      width: 17px;
+      position: relative;
+      top: 1px;
+      z-index: 40;
+    }
+  }
+  .stepspan.stepspan2 {
+    position: relative;
+    z-index: 20;
+    left: -17px;
+    .sptep {
+      padding-left: 30px !important;
+      border-radius: 0 !important;
+    }
+  }
+  .stepspan.stepspan3 {
+    position: relative;
+    z-index: 10;
+    left: -34px;
+    background-color: #fff;
+    .sptep {
+      padding-left: 30px !important;
+      border-radius: 0 !important;
+    }
+  }
+  .sptep.activestep {
+    color: #fff;
+    font-weight: bold;
+    background-color: #4eada7;
+  }
+}
+.stepcontent {
+  border-top: 1px solid #dcdfe6;
+  padding-top: 30px;
+}
+</style>

src/views/teamDetail/index.vue

@@ -8,9 +8,6 @@
       <div class="term active">第二学期</div> -->
     </h2>
     <div class="m-core">
-      <!-- <div class='newBand abs'
-           @click='resetTeam'>乐团修改</div> -->
-
       <p class='msg'
          :class="status=='PROGRESS'? 'ing' : '' "> <img :src="status=='PROGRESS'?stepImgs.PROGRESS:stepImgs.PAUSE"
              alt="">
@@ -128,10 +125,6 @@ export default {
     //   this.name = name;
     //   localStorage.setItem('teamName', name);
     // },
-    resetTeam () {
-      // id  type
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
-    }
   },
   components: {
     studentList,

src/views/teamDetail/indexCourse.vue

@@ -74,10 +74,6 @@ export default {
       this.name = name;
       localStorage.setItem('teamName', name);
     },
-    resetTeam () {
-      // id  type
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
-    }
   },
   components: {
     courseList,

src/views/teamDetail/teamInfo.vue

@@ -86,10 +86,6 @@ export default {
       this.name = name;
       localStorage.setItem('teamName', name);
     },
-    resetTeam () {
-      // id  type
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'resetTeam', id: this.teamid } })
-    }
   },
   components: {
     baseInfo,

src/views/teamDetail/teamList.vue

@@ -552,14 +552,17 @@ export default {
       });
     },
     createNewTeam() {
-        this.$store.dispatch('buildIndex',0)
+      this.$store.dispatch("buildIndex", 0);
+      this.$store.dispatch("delVisitedViews", { path: "/business/teamBuild" });
+
       this.$router.push(
-        { path: "/business/teamBuild", query: { type: "newTeam" } },
+        { path: "/business/teamBuild", query: { type: "newTeam",clear:'true'} },
         (router) => {
           router.meta.title = "新建乐团";
         }
       );
     },
+
     resetTeam() {
       // 这里还有勾选的乐团信息
       if (this.passed && this.passed.length <= 0) {
@@ -699,7 +702,7 @@ export default {
       switch (row.status) {
         case "DRAFT": {
           // 编辑中
-           this.$store.dispatch('buildIndex',0)
+          this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
               path: "/business/teamDraft",
@@ -713,10 +716,10 @@ export default {
         }
         case "AUDIT": {
           // 审核中
-           this.$store.dispatch('buildIndex',0)
+          this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/teamDraft",
+              path: "/business/teamAudit",
               query: { type: "teamAudit", id: row.id },
             },
             (router) => {
@@ -735,10 +738,10 @@ export default {
         }
         case "FEE_AUDIT": {
           // 费用审核中
-           this.$store.dispatch('buildIndex',0)
+          this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/teamDraft",
+              path: "/business/feeAudit",
               query: { type: "feeAudit", id: row.id },
             },
             (router) => {
@@ -749,10 +752,10 @@ export default {
         }
         case "AUDIT_FAILED": {
           // 审核失败
-           this.$store.dispatch('buildIndex',0)
+          this.$store.dispatch("draftIndex", 0);
           this.$router.push(
             {
-              path: "/business/teamDraft",
+              path: "/business/auditFailed",
               query: { type: "teamDraft", id: row.id },
             },
             (router) => {