修改预报名

src/utils/searchArray.js

@@ -107,7 +107,6 @@ export const musicGroupStatus = [
   { value: 'AUDIT_FAILED', text: '审核失败' },
   { value: 'PAUSE', text: '暂停' },
   { value: 'CANCELED', text: '取消' },
-  { value: 'FEE_AUDIT', text: '费用审核中' },
   { value: 'CLOSE', text: '已关闭' },
 ]
 

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

@@ -454,9 +454,17 @@ export default {
                 id: res.data,
               },
             });
-            this.$emit("chiosetab", 2);
+            // this.$emit("chiosetab", 2);
             this.$emit("getBaseInfo", obj);
             //  zheli
+
+            // 把第3步单独拆出来做成独立的模块
+            this.$router.push({
+              path: '/business/teamDetail',
+              query: {
+                ...query
+              }
+            })
           }
         });
       } else {
@@ -471,7 +479,16 @@ export default {
         updateSubjectInfo(obj).then((res) => {
           if (res.code == 200) {
             this.$message.success("提交成功");
-            this.$emit("chiosetab", 2);
+            // this.$emit("chiosetab", 2);
+
+            // 创建乐团，只会到声部了
+            let query = this.$route.query
+            this.$router.push({
+              path: '/business/teamDetail',
+              query: {
+                ...query
+              }
+            })
           }
         });
       }

src/views/teamBuild/createPayment.vue

@@ -0,0 +1,45 @@
+<template>
+    <div>
+        <el-tabs v-model.trim="activeIndex"
+             type="card"
+                    @tab-click="handleClick">
+            <el-tab-pane label="学员缴费"
+                        v-if="permission('/resetTeaming/teamBaseInfo')"
+                        name="1">
+                <resetPayList :isNewGropu="true"
+                            :baseInfo="baseInfo" />
+            </el-tab-pane>
+            <el-tab-pane label="学校缴费"
+                        v-if="permission('/resetTeaming/resetSound')"
+                        name="2">
+                <resetPayListSchool :isNewGropu="true"
+                                    :baseInfo="baseInfo"
+                                    v-if="activeIndex == 2" />
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script>
+import resetPayList from "@/views/resetTeaming/components/resetPayList";
+import resetPayListSchool from '@/views/resetTeaming/components/resetPayListSchool'
+// import teamPayInfo from "@/views/teamBuild/components/teamPayInfo";
+export default {
+    name: 'createPayment',
+    components: { resetPayList, resetPayListSchool },
+    data () {
+        return {
+            activeIndex: '1',
+            baseInfo: {}
+        };
+    },
+    mounted() {
+        // getTeamBaseInfo
+    },
+    methods: {
+        handleClick (val) {
+            this.activeIndex = val.name
+        },
+    }
+}
+</script>

src/views/teamBuild/forecastName.vue

@@ -16,7 +16,13 @@
               <el-button type="primary" @click="extendPaymentStatus = true">预报名时间延长</el-button>
             </auth>
             <auth>
-              <el-button type="primary">开启报名</el-button>
+              <el-button type="primary">家长会通知</el-button></el-button>
+            </auth>
+            <auth>
+              <el-button type="primary">乐团缴费</el-button>
+            </auth>
+            <auth>
+              <el-button type="primary">特色乐团缴费</el-button>
             </auth>
         </div>
 
@@ -53,19 +59,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-select
-                        placeholder="请选择班级"
-                        v-model="searchForm.teacherId"
+                    <el-input
+                        v-model.trim="searchForm.search"
                         clearable
-                        filterable
-                    >
-                        <el-option
-                        v-for="(item, index) in selects.teachers"
-                        :label="item.realName"
-                        :value="item.id"
-                        :key="index"
-                        ></el-option>
-                    </el-select>
+                        @keyup.enter.native="search"
+                        placeholder="学生编号/姓名/手机号"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-select
@@ -81,32 +80,6 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-select
-                        placeholder="报名缴费"
-                        v-model="searchForm.statusEnum"
-                        clearable
-                    >
-                        <el-option label="待处理" value="PENDING"></el-option>
-                        <el-option label="已完成" value="DONE"></el-option>
-                        <el-option label="已同意" value="AGREED"></el-option>
-                        <el-option label="已拒绝" value="DENIED"></el-option>
-                        <el-option label="已撤回" value="WITHDRAWN"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-select
-                        placeholder="是否激活"
-                        v-model="searchForm.statusEnum"
-                        clearable
-                    >
-                        <el-option label="待处理" value="PENDING"></el-option>
-                        <el-option label="已完成" value="DONE"></el-option>
-                        <el-option label="已同意" value="AGREED"></el-option>
-                        <el-option label="已拒绝" value="DENIED"></el-option>
-                        <el-option label="已撤回" value="WITHDRAWN"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
                     <el-button type="danger" native-type="seach">搜索</el-button>
                     <el-button native-type="reset" type="primary">重置</el-button>
                 </el-form-item>

src/views/teamBuild/index.vue

@@ -30,7 +30,7 @@
                class="arrow" />
         </span>
         <!--  @click="activeIndex = 2" -->
-        <span class="stepspan stepspan3"
+        <!-- <span class="stepspan stepspan3"
               v-if="showFlag?activeIndex  >=  2:true">
           <div class="step2 sptep"
                :class="activeIndex  >=  2 ? 'activestep' : ''">
@@ -39,7 +39,7 @@
           <img :src="activeIndex >= 2 ? stepImgs.nol : stepImgs.active"
                alt=""
                class="arrow" />
-        </span>
+        </span> -->
       </div>
 
       <!-- 下面显示的内容 -->
@@ -55,11 +55,11 @@
                           :getTeamList="getTeamList"
                           @getBaseInfo="getBaseInfo" />
         </div>
-        <div v-if="activeIndex == 2">
+        <!-- <div v-if="activeIndex == 2">
           <teamPayInfo @chiosetab="chiosetab"
                        :getTeamList="getTeamList"
                        :baseInfo="baseInfo" />
-        </div>
+        </div> -->
       </div>
     </div>
   </div>