乐团流程优化

src/layout/components/Sidebar/SidebarItem.vue

@@ -3,7 +3,7 @@
     <template
       v-if="
         hasOneShowingChild(item.children, item) &&
-        (!onlyOneChild.children|| onlyOneChild.children.length<1 || onlyOneChild.noShowingChildren) &&
+        (!onlyOneChild.children|| onlyOneChild.children.length<=1 || onlyOneChild.noShowingChildren) &&
         !item.alwaysShow
       "
     >
@@ -96,13 +96,7 @@ export default {
       // When there is only one child router, the child router is displayed by default
 
       if (showingChildren.length === 1) {
-        if(showingChildren[0].meta.title == '网管课管理'){
-          console.log(showingChildren[0])
-            console.log(this.onlyOneChild,this.onlyOneChild.children,this.onlyOneChild.noShowingChildren,this.item.alwaysShow)
-        }
         // console.log(showingChildren[0].meta.title)
-
-
         return true;
       }
 

src/router/notKeepAliveList.js

@@ -20,7 +20,7 @@ export default [
   '/journal/classFeesIsOk', // 课酬列表
   '/journal/requestProcessing', // 课酬申述
   '/journal/payAppeal', // 考勤申诉
-  '/business/teamDetail', // 乐团列表
+  '/teamList', // 乐团列表
   '/business/vipList', // vip列表
   '/business/teacherList', // 老师列表
   '/business/studentList', // 学员管理
@@ -77,7 +77,7 @@ export default [
   '/orderList/resetList', // 更换列表
   '/orderList/incomeOut', // 对外订单管理
   '/business/signupList', // 报名缴费
-  '/business/teamDetails', //进行中 查看
+  '/teamLists', //进行中 查看
   '/business/teamTeacherRecord', // 进行中 查看 上课记录
   '/business/teamLookBase', // 筹备中 乐团信息
   '/business/vipReset', // vip修改

src/styles/variables.scss

@@ -10,7 +10,7 @@ $subMenuBg:#2C3246;
 $subMenuHover:#13817A;
 $subMenuActiveBg:#13817A;
 
-$sideBarWidth: 230px;
+$sideBarWidth: 210px;
 /* 改变主题色变量 */
 $--color-primary: rgb(19, 129, 122);
 // the :export directive is the magic sauce for webpack

src/views/main/constant.js

@@ -98,7 +98,7 @@ export const errorType = {
   WAIT_CREATE_PAYMENT_CALENDER: {
     name: '待创建缴费项目',
     isError: true,
-    url: '/business/teamDetail',
+    url: '/teamList',
     resultKey: 'search',
   },
   COURSE_TRUANT_STUDENT_NUM: {

src/views/main/reminders/index.vue

@@ -59,9 +59,9 @@ export default {
   },
   methods: {
     handle(item) {
-      new Searchs().removeByKey('/business/teamDetail')
+      new Searchs().removeByKey('/teamList')
       this.$router.push({
-        path: '/business/teamDetail',
+        path: '/teamList',
         query: {
           filter_type: item.errorType,
           search: (item.result || []).join(','),

src/views/resetTeaming/components/resetPayList.vue

@@ -28,10 +28,10 @@
            @click="newUserPay"
            v-if="teamStatus"
            v-permission="'musicGroupPaymentCalender/add'">新建学员缴费</div>
-      <div class="newBand"
+      <!-- <div class="newBand"
            v-if="teamStatus"
            v-permission="'/studentPayBase'"
-           @click="setStudentPay">学员缴费设置</div>
+           @click="setStudentPay">学员缴费设置</div> -->
       <!-- <div class="newBand"
       v-if="!isNewGropu"
            @click="onCreateQRCode">续费二维码</div> -->
@@ -319,7 +319,7 @@
                    :rowDetail='activeRow'
                    :type="payFormType"
                    :baseInfo="baseInfo"
-                   :paymentType="isNewGropu ? 0 : undefined"
+                   :paymentType="team_status == 'PRE_BUILD_FEE' ? 0 : undefined"
                    :musicGroupId="$route.query.id" />
     </el-dialog>
 
@@ -400,6 +400,7 @@ export default {
   },
   data () {
     return {
+       team_status:'',
       musicGroupStu: [],
       payFormType: "user",
       userVisible: false,
@@ -452,6 +453,7 @@ export default {
       dialogSubjectList: [],
       activeName: null,
       dialogCalenderId: null, // 选择编号
+
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -489,6 +491,7 @@ export default {
   // },
   methods: {
     async init () {
+      this.team_status = this.$route.query.team_status
       try {
         const res = await getMusicGroupStu({
           musicGroupId: this.$route.query.id,
@@ -595,13 +598,14 @@ export default {
       if (row.payUserType === "SCHOOL") {
         this.reviewVisible = true;
       } else {
-        this.$router.push({ path: "/strudentPayInfo", query });
+         this.$router.push({path: "/strudentPayInfo", query})
+        // this.$router.push({ path: "/teamPayInfo/strudentPayInfo", query });
       }
     },
-    setStudentPay () {
-      let query = this.$route.query;
-      this.$router.push({ path: "/business/studentPayBase", query });
-    },
+    // setStudentPay () {
+    //   let query = this.$route.query;
+    //   this.$router.push({ path: "/business/studentPayBase", query });
+    // },
     async removeBatchNo (row) {
       try {
         await this.$confirm('是否确认删除该缴费批次?', '提示', {

src/views/resetTeaming/components/resetSound.vue

@@ -474,7 +474,7 @@ export default {
           for (let i in this.activeSoundList) {
             for (let j in res.data.musicGroupSubjectGoodsGroups) {
               if (this.activeSoundList[i].id == res.data.musicGroupSubjectGoodsGroups[j].subjectId) {
-                // 
+                //
                 if (res.data.musicGroupSubjectGoodsGroups[j].type == 'INSTRUMENT') {
                   this.activeSoundList[i].zhonglei = this.activeSoundList[i].zhonglei.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsIdList)
                   this.activeSoundList[i].zhonglei = this.activeSoundList[i].zhonglei.map(item => {
@@ -620,7 +620,7 @@ export default {
         updateSubjectInfo(obj).then(res => {
           if (res.code == 200) {
             this.$message.success('提交成功')
-            // this.$router.push({ path: '/business/teamDetail' })
+            // this.$router.push({ path: '/teamList' })
             this.getSound();
           }
         })
@@ -953,4 +953,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/resetTeaming/index.vue

@@ -256,6 +256,7 @@ export default {
     },
     getName(val) {
       this.name = val
+          this.teamid = this.$route.query.id;
     },
   },
 };

src/views/studentManager/components/teamAndcourse.vue

@@ -267,7 +267,7 @@ export default {
       });
     },
     gotoMusic(str){
-      this.$router.push({path:'/business/teamDetail',query:{search:str}})
+      this.$router.push({path:'/teamList',query:{search:str}})
     }
   }
 };

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

@@ -528,7 +528,7 @@ export default {
         //       .catch(() => {
         //         this.$store.dispatch("delVisitedViews", this.$route);
         //         this.$router.push({
-        //           path: "/business/teamDetail",
+        //           path: "/teamList",
         //         });
         //       });
         //   }
@@ -554,7 +554,7 @@ export default {
                   this.$message.success("提交成功");
                   this.$store.dispatch("delVisitedViews", this.$route);
                   this.$router.push({
-                    path: "/business/teamDetail",
+                    path: "/teamList",
                   });
                 }
               });
@@ -563,17 +563,24 @@ export default {
         }else{
            updateSubjectInfo(obj).then((res) => {
           if (res.code == 200) {
-            this.$message.success('保存成功')
+
+            if(type == 1){
+               this.$message.success('已提交审核')
+               let query = this.$route.query;
+            this.$store.dispatch("delVisitedViews", this.$route);
+            this.$router.push({
+              path: "/teamList",
+              query: {
+                ...query,
+              },
+            });
+
+            }else{
+               this.$message.success('保存成功')
+            }
             // this.$emit("chiosetab", 2);
             // 创建乐团，只会到声部了
-            // let query = this.$route.query;
-            // this.$store.dispatch("delVisitedViews", this.$route);
-            // this.$router.push({
-            //   path: "/business/teamDetail",
-            //   query: {
-            //     ...query,
-            //   },
-            // });
+
           }
         });
         }
@@ -698,7 +705,7 @@ export default {
 }
 .soundBtnFixed {
   top: 86px;
-  left: 270px; // 205
+  left: 250px; // 205
   width: 100%;
   position: fixed;
   background-color: #fff;

src/views/teamBuild/components/teamBaseInfo.vue

@@ -466,11 +466,6 @@ export default {
   },
   created() {},
   mounted() {
-    if (this.$route.query.id) {
-      this.teamid = this.$route.query.id;
-    }
-    this.teamStatus = this.$route.query.type;
-    this.team_status = this.$route.query.team_status;
     if (this.$route.query.type == "newTeam") {
       this.onReset();
     }
@@ -512,12 +507,14 @@ export default {
   deactivated() {},
   beforeDestroy() {
     // this.topFrom.paymentExpireDate = this.paymentExpireDate;
-    if(this.$route.query.id){
-         sessionStorage.setItem(`${this.$route.query.id}base`, JSON.stringify(this.topFrom));
-    }else{
+    if (this.$route.query.id) {
+      sessionStorage.setItem(
+        `${this.$route.query.id}base`,
+        JSON.stringify(this.topFrom)
+      );
+    } else {
       sessionStorage.setItem(`newTeambase`, JSON.stringify(this.topFrom));
     }
-
   },
 
   methods: {
@@ -556,14 +553,18 @@ export default {
     },
     init() {
       this.isInit = true;
-      this.teamStatus = this.$route.query.type;
-      if (this.teamStatus == "newTeam") {
-        this.$store.dispatch("buildIndex", 0);
+      if (this.$route.query.id) {
+        this.teamid = this.$route.query.id;
       }
+      this.teamStatus = this.$route.query.type;
+      this.team_status = this.$route.query.team_status;
+      // if (this.teamStatus == "newTeam") {
+      //   this.$store.dispatch("buildIndex", 0);
+      // }
 
-      if (this.teamStatus != "newTeam") {
-        this.$store.dispatch("draftIndex", 0);
-      }
+      // if (this.teamStatus != "newTeam") {
+      //   this.$store.dispatch("draftIndex", 0);
+      // }
       // 传过来的乐团信息
       this.activeTeam = this.getTeamList;
       if (
@@ -612,12 +613,11 @@ export default {
       } else {
         // 如果是新建团
         let sotrage = JSON.parse(sessionStorage.getItem(`newTeambase`));
-        sotrage?this.topFrom = sotrage:this.topFrom;
-            if (this.topFrom?.section) {
-            // 获取员工
-            this.getBaseList(this.topFrom.section);
-          }
-
+        sotrage ? (this.topFrom = sotrage) : this.topFrom;
+        if (this.topFrom?.section) {
+          // 获取员工
+          this.getBaseList(this.topFrom.section);
+        }
       }
       this.getStudentStatus();
       this.$emit("getName", this.topFrom?.name);
@@ -784,7 +784,7 @@ export default {
                   // 跳到第二页
                 } else {
                   this.$message.success("修改乐团成功");
-                  // this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
+                  // this.$router.push({ path: '/teamLists', query: { id: this.teamid, name: this.topFrom.name } })
                 }
                 this.init();
               }
@@ -812,7 +812,17 @@ export default {
                     this.$emit("handleClick", { name: "2" });
                     this.$emit("getName", this.topFrom.name);
                   })
-                  .catch(() => {});
+                  .catch(() => {
+                    this.$router.push({
+                      query: merge(this.$route.query, {
+                        type: "teamDraft",
+                        id: res.data,
+                        team_status: "DRAFT",
+                      }),
+                    });
+                    this.$emit("getName", this.topFrom.name);
+                    this.init();
+                  });
               }
             });
           }
@@ -867,7 +877,7 @@ export default {
               // let query = this.$route.query;
               // this.$message.success("开启成功");
               // this.$router.push({
-              //   path: "/business/teamDetail",
+              //   path: "/teamList",
               //   query: {
               //     ...query,
               //   },
@@ -931,7 +941,7 @@ export default {
               this.$message.success("开启成功");
               this.paymentStatus = false;
               this.$store.dispatch("delVisitedViews", this.$route);
-              this.$router.push({ path: "/business/teamDetail" });
+              this.$router.push({ path: "/teamList" });
               // this.$router.push({
               //   path: "/business/resetTeaming",
               //   query: {

src/views/teamBuild/components/teamPayInfo.vue

@@ -59,7 +59,7 @@ export default {
     goHome () {
       let query = this.$route.query
       this.$router.push({
-        path: '/business/teamDetail',
+        path: '/teamList',
         query: {
           ...query
         }
@@ -80,4 +80,4 @@ export default {
     width: 120px;
   }
 }
-</style>
+</style>

src/views/teamBuild/components/teamResetSound.vue

@@ -298,7 +298,7 @@ export default {
     },
     // 点击添加学生
     resetStudent (row) {
-      // 乐团id 声部id 
+      // 乐团id 声部id
       this.studentVisible = true;
       this.activeSoundId = row.id;
 
@@ -382,7 +382,7 @@ export default {
           // 不对
           this.activeSoundList[i].studentList = result;
           this.activeListStudent = result;
-          // // 添加全局 
+          // // 添加全局
 
           if (this.allActiveStudent.length <= 0) {
             // console.log('第一次添加数据')
@@ -543,7 +543,7 @@ export default {
         if (res.code == 200) {
           // 成功 跳转到筹备中
           let id = res.data;
-          this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+          this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
         }
       })
     },
@@ -730,4 +730,4 @@ export default {
     width: 120px;
   }
 }
-</style>
+</style>

src/views/teamBuild/components/teamSoundMoney.vue

@@ -1471,7 +1471,7 @@ export default {
               if (res.code == 200) {
                 // 成功 跳转到乐团报名详情
                 this.$router.push({
-                  path: "/business/teamDetail",
+                  path: "/teamList",
                   query: { search: this.Fsearch, rules: this.Frules }
                 });
               }
@@ -1598,7 +1598,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success("提交成功");
                 this.$router.push({
-                  path: "/business/teamDetail",
+                  path: "/teamList",
                   query: { search: this.Fsearch, rules: this.Frules }
                 });
               }
@@ -1619,7 +1619,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("审核通过");
               this.$router.push({
-                path: "/business/teamDetail",
+                path: "/teamList",
                 query: { search: this.Fsearch, rules: this.Frules }
               });
             }
@@ -1643,7 +1643,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("已拒绝");
               this.$router.push({
-                path: "/business/teamDetail",
+                path: "/teamList",
                 query: { search: this.Fsearch, rules: this.Frules }
               });
             }

src/views/teamBuild/components/teamSoundSet.vue

@@ -160,7 +160,7 @@ export default {
               this.$message.success("审核通过");
               this.$store.dispatch("delVisitedViews", this.$route);
               this.$router.push({
-                path: "/business/teamDetail",
+                path: "/teamList",
                 query: { search: this.Fsearch, rules: this.Frules },
               });
             }
@@ -185,7 +185,7 @@ export default {
                 this.$message.success("已拒绝");
                 this.$store.dispatch("delVisitedViews", this.$route);
                 this.$router.push({
-                  path: "/business/teamDetail",
+                  path: "/teamList",
                   query: { search: this.Fsearch, rules: this.Frules },
                 });
               }

src/views/teamBuild/createPayment.vue

@@ -53,8 +53,8 @@ export default {
             this.activeIndex = val.name
         },
         onCancel() {
-             this.$store.dispatch('delVisitedViews', this.$route) 
-            this.$router.push({ path: "/business/teamDetail" });
+             this.$store.dispatch('delVisitedViews', this.$route)
+            this.$router.push({ path: "/teamList" });
         },
         async getList() {
             await getTeamBaseInfo({ musicGroupId: this.musicGroupId }).then((res) => {
@@ -66,9 +66,9 @@ export default {
         goHome () {
             this.$store.dispatch('delVisitedViews', this.$route)
             this.$router.push({
-                path: '/business/teamDetail',
+                path: '/teamList',
             })
         }
     }
 }
-</script>
+</script>

src/views/teamBuild/forecastName.vue

@@ -304,7 +304,7 @@ export default {
         },
         onCancel() {
              this.$store.dispatch('delVisitedViews', this.$route)
-            this.$router.push({ path: "/business/teamDetail" });
+            this.$router.push({ path: "/teamList" });
         },
         downloadFile() {
             let params = this.searchForm;
@@ -346,7 +346,7 @@ export default {
                     })
                     this.$store.dispatch('delVisitedViews', this.$route)
                     this.$router.push({
-                        path: '/business/teamDetail'
+                        path: '/teamList'
                     })
                 })
 

src/views/teamBuild/index.vue

@@ -117,7 +117,7 @@ export default {
     goBack () {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: "/business/teamDetail",
+        path: "/teamList",
       });
     },
     getBaseInfo (baseInfo) {

src/views/teamBuild/modals/close-studens.vue

@@ -31,7 +31,7 @@
         </el-table-column>
         <el-table-column prop="surplusCourseFee" align="center" label="退费金额(元)" width="150">
           <template slot-scope="scope">
-            <el-form-item
+            <el-form-item style="margin-bottom:0"
               :prop="'' + scope.row.userId"
               :rules="[
                 { required: true, message: '' },

src/views/teamBuild/signupList.vue

@@ -912,7 +912,7 @@ export default {
     },
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
-      this.$router.push({ path: "/business/teamDetail" });
+      this.$router.push({ path: "/teamList" });
     },
     payStart() {
       this.paymentStatus = true;
@@ -1160,7 +1160,7 @@ export default {
               // let query = this.$route.query;
               // this.$message.success("开启成功");
               // this.$router.push({
-              //   path: "/business/teamDetail",
+              //   path: "/teamList",
               //   query: {
               //     ...query,
               //   },
@@ -1185,7 +1185,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("停止成功");
               this.$router.push({
-                path: "/business/teamDetail",
+                path: "/teamList",
               });
             }
           });

src/views/teamBuild/teamDraft.vue

@@ -148,7 +148,7 @@ export default {
     goBack() {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
-        path: "/business/teamDetail",
+        path: "/teamList",
       });
     },
     getBaseInfo(baseInfo) {

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -383,7 +383,7 @@ export default {
         return;
       }
       if (!this.permission('/teamSetting/salarySet')) {
-        this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+        this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
       } else {
         this.$emit('gotoNav', 4)
       }
@@ -411,7 +411,7 @@ export default {
               this.$message.success('恭喜您创建成功')
 
               if (!this.permission('/teamSetting/salarySet')) {
-                this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+                this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
               } else {
                 this.$emit('gotoNav', 4)
               }
@@ -479,4 +479,4 @@ export default {
     background-color: #4eada7;
   }
 }
-</style>
+</style>

src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -257,7 +257,7 @@ export default {
         if (res.code == 200) {
           this.subList = [];
           this.$message.success('恭喜您设置成功');
-          this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+          this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
         }
       }).catch(res => {
         this.$message.error('提交失败')
@@ -331,4 +331,4 @@ export default {
   background-color: #fff;
   min-height: 75vh;
 }
-</style>
+</style>

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -290,7 +290,7 @@ export default {
 
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+      this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
     },
     resetClass (row) {
       this.activeStudent = row.userId;
@@ -324,4 +324,4 @@ export default {
     width: 80px;
   }
 }
-</style>
+</style>

src/views/teamBuild/teamSeting/index.vue

@@ -174,7 +174,7 @@ export default {
     },
     goBack () {
        this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/business/teamDetail'})
+      this.$router.push({ path: '/teamList'})
     }
   },
 }

src/views/teamDetail/components/studentList.vue

@@ -21,6 +21,13 @@
     </statistic> -->
 
     <!-- style="margin-bottom: 15px" -->
+        <p
+      style="margin-bottom: 15px; font-size: 16px; font-weight: 400"
+    >
+      报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
+        paymentExpireDate | formatTimer
+      }}
+    </p>
     <div class="studentListWrap" v-if="team_status == 'PROGRESS'">
       <div
         class="newBand"
@@ -120,6 +127,20 @@
         >
           合并学员
         </div>
+        <div
+          v-if="
+            team_status == 'APPLY' ||
+            team_status == 'PROGRESS' ||
+            team_status == 'PREPARE'
+          "
+          v-permission="'studentRegistration/openPayment'"
+          class="newBand"
+          style="background-color: #14928a; border: 1px solid #14928a"
+          @click="onPartPayment"
+          type="primary"
+        >
+          提前开启缴费
+        </div>
         <el-popover placement="bottom" width="800" trigger="hover">
           <div>
             <el-table
@@ -169,25 +190,26 @@
               <el-button v-show="isEdit" @click="saveIsEdit">保存</el-button>
             </div>
           </div>
+          <auth :auths="'studentRegistration/openPayment'">
+            <el-button
+              style="background-color: #14928a; border: 1px solid #14928a"
+              @click="onPartPayment"
+              type="primary"
+              >开启缴费</el-button
+            >
+          </auth>
           <div class="newBand" style="margin-bottom: 10px" slot="reference">
             声部报名计划
           </div>
         </el-popover>
       </div>
-      <p
-        style="margin-bottom: 15px; font-size: 16px; font-weight: 400"
-        v-if="
-          team_status == 'PAY' ||
-          team_status == 'PROGRESS' ||
-          team_status == 'PREPARE'
-        "
-      >
-        报名截止时间:{{ applyExpireDate | formatTimer }} 缴费截止时间:{{
-          paymentExpireDate | formatTimer
-        }}
-      </p>
     </div>
-    <!--  -->
+         <!-- v-if="
+        team_status == 'PAY' ||
+        team_status == 'PROGRESS' ||
+        team_status == 'PREPARE'
+      " -->
+
     <!-- 搜索类型 -->
     <save-form
       ref="searchForm"
@@ -285,8 +307,9 @@
           filterable
           placeholder="报名缴费"
         >
-          <el-option label="未缴费" value="0"></el-option>
-          <el-option label="已缴费" value="1"></el-option>
+          <el-option label="未开启" value="0"></el-option>
+          <el-option label="开启缴费" value="1"></el-option>
+          <el-option label="已缴费" value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="oweFlag">
@@ -369,7 +392,13 @@
       <el-table
         :data="tableList"
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        @selection-change="handleSelectionChange"
       >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="checkboxSelect"
+        ></el-table-column>
         <el-table-column label="学员编号" width="120px;" prop="userId">
           <template slot-scope="scope">
             <copy-text>
@@ -411,7 +440,7 @@
             <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 }}
@@ -437,7 +466,7 @@
         </el-table-column>
         <el-table-column align="center" label="报名缴费">
           <template slot-scope="scope">
-            <div>{{ scope.row.paymentStatus | studentPays }}</div>
+            <div>{{ scope.row.paymentStatus | paymentStatus }}</div>
           </template>
         </el-table-column>
         <el-table-column align="center" label="是否激活">
@@ -467,7 +496,7 @@
               <!-- musicGroupPaymentCalenderDetail/queryPage/studentList -->
               <auth
                 auths="musicGroupPaymentCalenderDetail/queryPage/studentList"
-                :router="['/business/teamDetails']"
+                :router="['/teamLists']"
               >
                 <i
                   style="color: #14928a; font-size: 17px"
@@ -1000,7 +1029,12 @@
         :voiceList="leftList"
       />
     </el-dialog>
-    <el-dialog title="订单详情" :visible.sync="orderVisible" width="600px" v-if="orderVisible">
+    <el-dialog
+      title="订单详情"
+      :visible.sync="orderVisible"
+      width="600px"
+      v-if="orderVisible"
+    >
       <el-form :model="orderForm" :inline="true">
         <!--     name: '',
         totalAmount: '',
@@ -1042,7 +1076,7 @@
         >
       </div>
     </el-dialog>
-       <el-dialog title="修改专业" :visible.sync="subjectVisible" width="400px">
+    <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>
@@ -1082,14 +1116,14 @@ import {
   getTeamBaseInfo,
   getintoClass,
   resetPlanNum,
-
+  openPayment
 } from "@/api/buildTeam";
 import {
   addStudent,
   getStudentClass,
   getStudentInfoByPhone,
-    getStudentFeeDetail,
-    resetStudentSubject
+  getStudentFeeDetail,
+  resetStudentSubject,
 } from "@/api/studentManager";
 import qrCode from "@/components/QrCode/index";
 import { getOrganizationCourseUnitPriceSettings } from "@/api/specialSetting";
@@ -1330,10 +1364,11 @@ export default {
         others: "",
         othersPrice: "",
       },
-      maskSoundForm:{
-          subject: "",
+      maskSoundForm: {
+        subject: "",
       },
-      subjectVisible:false
+      subjectVisible: false,
+      multipleSelection: [],
     };
   },
   components: {
@@ -2004,7 +2039,7 @@ export default {
               // let query = this.$route.query;
               // this.$message.success("开启成功");
               // this.$router.push({
-              //   path: "/business/teamDetail",
+              //   path: "/teamList",
               //   query: {
               //     ...query,
               //   },
@@ -2067,7 +2102,7 @@ export default {
               this.$message.success("开启成功");
               this.paymentStatus = false;
               this.$store.dispatch("delVisitedViews", this.$route);
-              this.$router.push({ path: "/business/teamDetail" });
+              this.$router.push({ path: "/teamList" });
               // this.$router.push({
               //   path: "/business/resetTeaming",
               //   query: {
@@ -2242,13 +2277,13 @@ export default {
         }
       });
     },
-        // 修改专业
+    // 修改专业
     resetSubject(row) {
       this.activeId = row.userId;
       this.subjectVisible = true;
       //   resetStudentSubject().then(res=>{]})
     },
-        okReset() {
+    okReset() {
       if (!this.maskSoundForm.subject) {
         this.$message.error("请选择调剂专业");
         return;
@@ -2271,6 +2306,43 @@ export default {
         }
       });
     },
+    onPartPayment() {
+      // 部分缴费
+      let selection = this.multipleSelection;
+      if (selection.length <= 0) {
+        this.$message.error("您还没有选择学生");
+        return false;
+      }
+      let ids = [];
+      selection.forEach((item) => {
+        ids.push(item.id);
+      });
+
+      this.$confirm(`是否确认开启缴费?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          openPayment({
+            ids: ids.join(","),
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("开启成功");
+              this.getList();
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    checkboxSelect(row) {
+      return row.paymentStatus == 0;
+    },
   },
   watch: {
     quitVisible(val) {

src/views/teamDetail/components/studentSignin.vue

@@ -164,7 +164,7 @@ export default {
       this.$store.dispatch('delVisitedViews', this.$route)
       let params = this.$route.query
       this.$router.push({
-        path: '/business/teamDetails',
+        path: '/teamLists',
         query: {
           id: params.id,
           status: params.status,
@@ -231,4 +231,4 @@ export default {
 //     }
 //   }
 // }
-</style>
+</style>

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -140,7 +140,7 @@ export default {
       // window.history.back()
       let params = this.$route.query
       this.$router.push({
-        path: '/business/teamDetails',
+        path: '/teamLists',
         query: {
           id: params.id,
           status: params.status,
@@ -184,4 +184,4 @@ export default {
 }
 </script>
 <style lang="scss">
-</style>
+</style>

src/views/teamDetail/index.vue

@@ -121,7 +121,7 @@ export default {
     },
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/business/teamDetail'})
+      this.$router.push({ path: '/teamList'})
     },
     // getname (name) {
     //   this.name = name;

src/views/teamDetail/indexCourse.vue

@@ -68,7 +68,7 @@ export default {
       this.activeIndex = val.name;
     },
     onCancel () {
-      this.$router.push({ path: '/business/teamDetail' })
+      this.$router.push({ path: '/teamList' })
     },
     getname (name) {
       this.name = name;

src/views/teamDetail/teamCourseList.vue

@@ -1024,7 +1024,7 @@ export default {
     gotoCourse(row) {
       if (row.groupType == "MUSIC") {
         this.$router.push({
-          path: "/business/teamDetail",
+          path: "/teamList",
           query: { search: row.musicGroupId },
         });
       } else if (row.groupType == "VIP") {

src/views/teamDetail/teamDetailedList.vue

@@ -106,7 +106,7 @@ export default {
     },
     onCancel () {
        this.$store.dispatch('delVisitedViews', this.$route)
-      this.$router.push({ path: '/business/teamDetail'})
+      this.$router.push({ path: '/teamList'})
     },
     okDetailList () {
       this.$confirm(`是否确认发放清单?`, '提示', {
@@ -116,7 +116,7 @@ export default {
       }).then(() => {
         verifyMusicalList({ musicGroupId: this.teamid }).then(res => {
           if (res.code == 200) {
-            this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
+            this.$router.push({ path: '/teamList', query: { search: this.Fsearch, rules: this.Frules } })
           }
         })
       }).catch(() => { })

src/views/teamDetail/teamInfo.vue

@@ -128,7 +128,7 @@ export default {
     },
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
-      this.$router.push({ path: "/business/teamDetail" });
+      this.$router.push({ path: "/teamList" });
     },
     getname(name) {
       this.name = name;

src/views/teamDetail/teamList.vue

@@ -99,6 +99,8 @@
                            :selectable="checkSelectable"
                            width="50">
           </el-table-column> -->
+          <el-table-column prop="organName" align="center"
+            label="所属分部"></el-table-column>
           <el-table-column
             prop="id"
             width="100"
@@ -609,7 +611,7 @@ export default {
     lookTeamCourse(row) {
       // 查看课表
       this.$router.push({
-        path: "/business/teamDetailCourse",
+        path: "/teamListCourse",
         query: { id: row.id, name: row.name },
       });
     },
@@ -667,6 +669,7 @@ export default {
               id: row.id,
               name: row.name,
               team_status: "PRE_BUILD_FEE",
+              tabrouter:3
             },
 
           }, (router) => {
@@ -712,6 +715,7 @@ export default {
               id: row.id,
               name: row.name,
               team_status: "PRE_APPLY",
+              tabrouter:9
             },
           },  (router) => {
               router.meta.title = "乐团预报名";
@@ -732,7 +736,8 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: "APPLY",
-                type:'look'
+                type:'look',
+                tabrouter:7
               },
             },
             (router) => {
@@ -751,7 +756,8 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: "PAY",
-                type:'look'
+                type:'look',
+                tabrouter:7
               },
             },
             (router) => {
@@ -764,7 +770,7 @@ export default {
           // 筹备中 跳转到乐团设置界面
           this.$router.push({
             path: `/resetTeaming`,
-            query: {  type:'look',status: row.status, id: row.id, name: row.name,team_status:row.status },
+            query: {  type:'look',status: row.status, id: row.id, name: row.name,team_status:row.status,tabrouter:10 },
           },
            (router) => {
               router.meta.title = "乐团筹备中";
@@ -806,7 +812,7 @@ export default {
         case "PAUSE": {
           // 暂停
           // this.$router.push({
-          //   path: `/business/teamDetails`,
+          //   path: `/teamLists`,
           //   query: { status: row.status, id: row.id, name: row.name },
           // });
           this.$router.push({
@@ -851,7 +857,7 @@ export default {
     },
     gotodetailList(row) {
       this.$router.push({
-        path: "/business/teamDetailedList",
+        path: "/teamListedList",
         query: { id: row.id },
       });
     },