1127 21:02

111

src/views/teamBuild/index.vue

@@ -2,7 +2,10 @@
   <div class='m-container'>
     <div class="line"></div>
     <h2>
-      <div class='squrt'></div> {{ pageName }}
+      <!-- <div class='squrt'></div> {{ pageName }} -->
+      <el-page-header @back="goBack"
+                      :content="pageName">
+      </el-page-header>
     </h2>
     <div class="m-core">
       <div class="stepbox">
@@ -78,7 +81,9 @@ export default {
       },
       pageName: '建团申请',
       getTeamList: [],
-      teamStatus: ''
+      teamStatus: '',
+      Fsearch: null,
+      Frules: null
     }
   },
   created () {
@@ -87,6 +92,13 @@ export default {
     if (this.$route.query.teamList) {
       this.getTeamList = this.$route.query.teamList
     }
+    // 判断是否带缓存参数
+    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 == 'newTeam') {
       // 新建团
@@ -98,6 +110,9 @@ export default {
   methods: {
     chiosetab (val) {
       this.activeIndex = val;
+    },
+    goBack () {
+      // this.$rout
     }
   },
 }

src/views/teamDetail/components/resetClass.vue

@@ -329,7 +329,7 @@
                             :picker-options="{
                                start: '08:30',
                                step: '00:05',
-                               end: '18:30'
+                               end: '23:55'
             }">
             </el-time-select>
             <span>结束时间</span>
@@ -338,7 +338,7 @@
                             :picker-options="{
                               start: '08:30',
                               step: '00:05',
-                              end: '18:30'
+                              end: '23:55'
             }">
             </el-time-select>
             <el-button type="danger"

src/views/teamDetail/teamList.vue

@@ -5,9 +5,11 @@
     </h2>
     <div class="m-core">
       <div class="btnList">
-        <div class='newBand' v-permission="'/teamBuild'"
+        <div class='newBand'
+             v-permission="'/teamBuild'"
              @click="createNewTeam">新建乐团</div>
-        <div class='newBand' v-permission="'/teamBuild/trimming'"
+        <div class='newBand'
+             v-permission="'/teamBuild/trimming'"
              @click="resetTeam">乐团调整</div>
       </div>
 
@@ -137,60 +139,71 @@
                            label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" v-permission="'/setImprovement'"
+                <el-button type="text"
+                           v-permission="'/setImprovement'"
                            v-if="scope.row.status == 'PREPARE'"
                            @click="gotoImprovement(scope.row)">基础技能班</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status == 'PREPARE'" v-permission="'/teamDetailedList'"
+                           v-if="scope.row.status == 'PREPARE'"
+                           v-permission="'/teamDetailedList'"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
 
                 <!-- 报名中&缴费中 查看 -->
-                <el-button type="text" v-permission="'/signupList'"
+                <el-button type="text"
+                           v-permission="'/signupList'"
                            v-if="scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
 
                 <!-- 进行中 查看 -->
-                <el-button type="text" v-permission="'/teamDetails'"
+                <el-button type="text"
+                           v-permission="'/teamDetails'"
                            v-if="scope.row.status == 'PROGRESS'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
 
                 <!-- 暂停中 查看 -->
-                <el-button type="text" v-permission="'musicGroup/pauseMusicGroup/look'"
+                <el-button type="text"
+                           v-permission="'musicGroup/pauseMusicGroup/look'"
                            v-if="scope.row.status == 'PAUSE'"
                            @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-permission="'teamDetail/teamSeting/update'"
+                <el-button type="text"
+                           v-permission="'teamDetail/teamSeting/update'"
                            v-if="scope.row.status == 'PREPARE'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 审核中 编辑 -->
-                <el-button type="text" v-permission="'teamDetail/audit/update'"
+                <el-button type="text"
+                           v-permission="'teamDetail/audit/update'"
                            v-if="scope.row.status == 'AUDIT'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 编辑中 编辑 -->
-                <el-button type="text" v-permission="'teamDetail/draft/update'"
+                <el-button type="text"
+                           v-permission="'teamDetail/draft/update'"
                            v-if="scope.row.status == 'DRAFT'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <!-- 审核失败 编辑 -->
-                <el-button type="text" v-permission="'teamDetail/aduitFailed/update'"
+                <el-button type="text"
+                           v-permission="'teamDetail/aduitFailed/update'"
                            v-if="scope.row.status == 'AUDIT_FAILED'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
 
-                
-                <el-button v-if="scope.row.status == 'PREPARE'" v-permission="'musicGroup/action'"
+                <el-button v-if="scope.row.status == 'PREPARE'"
+                           v-permission="'musicGroup/action'"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>
-                <el-button type="text" v-permission="'musicGroup/cancelMusicGroup'"
+                <el-button type="text"
+                           v-permission="'musicGroup/cancelMusicGroup'"
                            v-if="scope.row.status == 'AUDIT'"
                            @click="stopTeam(scope.row)">取消申请</el-button>
-                <el-button v-if="scope.row.status == 'PAUSE'"  v-permission="'musicGroup/resumeMusicGroup'"
+                <el-button v-if="scope.row.status == 'PAUSE'"
+                           v-permission="'musicGroup/resumeMusicGroup'"
                            @click="onTeamOpeation('start', scope.row)"
                            type="text">启动</el-button>
-                <el-button v-if="scope.row.status == 'PROGRESS'"  v-permission="'musicGroup/pauseMusicGroup'"
+                <el-button v-if="scope.row.status == 'PROGRESS'"
+                           v-permission="'musicGroup/pauseMusicGroup'"
                            @click="onTeamOpeation('pause', scope.row)"
                            type="text">暂停</el-button>
                 <el-button v-if="scope.row.status == 'PROGRESS'"
@@ -286,7 +299,7 @@ export default {
       })
     },
     createNewTeam () {
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'newTeam' } })
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'newTeam', search: this.topForm, rules: this.rules } })
     },
     resetTeam () {
       // 这里还有勾选的乐团信息
@@ -294,11 +307,11 @@ export default {
         this.$message.error('请至少选择一个乐团进行调整')
         return
       }
-      this.$router.push({ path: '/business/teamBuild', query: { type: 'teamList', teamList: this.passed } })
+      this.$router.push({ path: '/business/teamBuild', query: { type: 'teamList', teamList: this.passed, search: this.topForm, rules: this.rules } })
     },
     resetTeaming (row) {
       // 修改进行中的乐团
-      this.$router.push({ path: '/business/resetTeaming', query: { type: 'resetTeam', id: row.id } })
+      this.$router.push({ path: '/business/resetTeaming', query: { type: 'resetTeam', id: row.id, search: this.topForm, rules: this.rules } })
     },
     setSearchList (obj) {
       // 
@@ -388,38 +401,38 @@ export default {
       switch (row.status) {
         case 'DRAFT': {
           // 编辑中
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'AUDIT': {
           // 审核中
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamAudit', id: row.id } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamAudit', id: row.id, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'AUDIT_FAILED': {
           // 审核失败
-          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id } })
+          this.$router.push({ path: '/business/teamBuild', query: { type: 'teamDraft', id: row.id, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'APPLY': {
           // 报名中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'PAY': {
           // 缴费中
-          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name } })
+          this.$router.push({ path: `/business/signupList`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'PREPARE': {
           // 筹备中 跳转到乐团设置界面
-          this.$router.push({ path: `/business/teamSeting`, query: { status: row.status, id: row.id, name: row.name } })
+          this.$router.push({ path: `/business/teamSeting`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
           break;
         }
         case 'PROGRESS': {
           // 进行中
           // 调到乐团详情 teamDetails
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
           break
         }
         case 'CANCELED': {
@@ -428,7 +441,7 @@ export default {
         }
         case 'PAUSE': {
           // 暂停
-          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name } })
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name, search: this.topForm, rules: this.rules } })
           break;
         }
       }
@@ -447,11 +460,11 @@ export default {
     },
     gotodetailList (row) {
       // row.id
-      this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id } })
+      this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id, search: this.topForm, rules: this.rules } })
     },
     // setImprovement 设置基础技能班
     gotoImprovement (row) {
-      this.$router.push({ path: '/business/setImprovement', query: { id: row.id } })
+      this.$router.push({ path: '/business/setImprovement', query: { id: row.id, search: this.topForm, rules: this.rules } })
     },
     // 停止乐团
     stopTeam (row) {