修改合并个学员至报名中

src/views/teamBuild/components/merge-music.vue

@@ -20,24 +20,27 @@
       </el-collapse-item>
     </el-collapse>
     <div class="btns">
-      <el-button type="primary" @click="$emit('chiosetab', 1)">上一步</el-button>
+      <el-button @click="$emit('close')">关闭</el-button>
       <el-button type="primary" @click="merge">确认合并</el-button>
     </div>
     <el-dialog
       title="选择乐团"
       :visible.sync="visible"
       width="700px"
+      append-to-body
     >
       <selectMusic
         :visible="visible"
         @close="visible = false"
         @submited="submited"
+        :organId="organId"
       />
     </el-dialog>
     <el-dialog
       title="查看已合并学生"
       :visible.sync="studentsVisible"
       width="700px"
+      append-to-body
     >
       <mergedStudents
         @close="studentsVisible = false"
@@ -53,7 +56,8 @@ import selectMusic from './select-msic'
 import selectItem from './select-item'
 import mergedStudents from './merged-students'
 export default {
-  components: {
+  props: ['organId']
+,  components: {
     selectMusic,
     selectItem,
     mergedStudents,
@@ -146,7 +150,9 @@ export default {
     },
     async FetchList() {
       try {
-        const res = await getTeamList()
+        const res = await getTeamList({
+          organId: this.organId,
+        })
         this.tableData = res.data.rows
       } catch (error) {}
     },

src/views/teamBuild/components/select-msic.vue

@@ -62,7 +62,7 @@
 import pagination from '@/components/Pagination/index'
 import { getTeamList, getPayType } from "@/api/teamServer";
 export default {
-  props: ['visible'],
+  props: ['visible', 'organId'],
   components: { pagination },
   data() {
     return {
@@ -127,6 +127,7 @@ export default {
         const res = await getTeamList({
           rows: this.rules.limit,
           page: this.rules.page,
+          organId: this.organId,
           ...this.search
         })
         this.tableData = res.data.rows.filter(item => item.id !== this.$route.query.id)

src/views/teamBuild/components/teamSoundSet.vue

@@ -11,14 +11,16 @@
     <div class="btnWrap">
       <el-button type="primary" @click="goback" style="margin-right: 10px;">上一步</el-button>
       <!--  v-if="teamStatus != 'teamAudit'" -->
-      <el-button class="submitBtn"
-           v-permission="{
+      <div
+        class="submitBtn"
+        v-permission="{
           child: 'musicGroup/createGroup',
           parent: '/teamBuild/soundMoney',
         }"
-        @click="submitInfo()">
-        创建缴费
-      </el-button>
+        @click="submitInfo()"
+      >
+        下一步
+      </div>
       <!-- <div
         class="submitBtn"
         @click="submitAudit(1)"

src/views/teamBuild/signupList.vue

@@ -56,8 +56,18 @@
           >
             报表导出
           </div>
+          <div
+            class="newBand"
+            v-permission="'musicGroup/addMusicGroupRegs'"
+            @click="mergeVisible = true"
+          >
+            合并学员
+          </div>
         </div>
       </div>
+      <el-dialog title="选择合并乐团" :visible.sync="mergeVisible" width="900px">
+        <mergeMusic v-if="mergeVisible" style="padding: 0 20px;" :organId="organId" @close="mergeVisible = false"/>
+      </el-dialog>
       <!--  stepImgs: {
         APPLY: require('@/assets/images/base/clock.png'),
         PAY: require('@/assets/images/base/pay.png')
@@ -607,6 +617,7 @@ import {
   studentApplyDetailExport,
   StudentQuit,
 } from "@/api/buildTeam";
+import mergeMusic from './components/merge-music'
 import { resetStudentSubject, getStudentFeeDetail } from "@/api/studentManager";
 import { vaildStudentUrl, vaildTeacherUrl } from "@/utils/validate";
 import { addVisit } from "@/views/returnVisitManager/api.js";
@@ -624,12 +635,14 @@ export default {
   components: {
     pagination,
     changeVoice,
+    mergeMusic,
   },
   data() {
     return {
       multipleSelection: [], //
       isEdit: false,
       rowDetail: null,
+      mergeVisible: false,
       changeVoiceVisible: false,
       subjectVisible: false,
       orderVisible: false,
@@ -696,6 +709,7 @@ export default {
       qrcodes2: true,
       qrcode2: null,
       codeUrl2: null,
+      organId: '',
       extendPaymentStatus: false,
       extendForm: {
         expireDate: null,
@@ -764,6 +778,7 @@ export default {
       this.pickerOptions = this.beginDate(new Date());
       getTeamBaseInfo({ musicGroupId: this.id }).then((res) => {
         if (res.code == 200) {
+          this.organId = res.data.musicGroup.organId
           this.applyExpireDate = res.data.musicGroup.applyExpireDate;
           this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
         }