|  | @@ -1,124 +1,6 @@
 | 
	
		
			
				|  |  |  <template>
 | 
	
		
			
				|  |  |    <div class="base-container">
 | 
	
		
			
				|  |  | -    <div class="topFunction">
 | 
	
		
			
				|  |  | -      <div
 | 
	
		
			
				|  |  | -        style="
 | 
	
		
			
				|  |  | -          display: flex;
 | 
	
		
			
				|  |  | -          justify-content: space-between;
 | 
	
		
			
				|  |  | -          align-items: center;
 | 
	
		
			
				|  |  | -        "
 | 
	
		
			
				|  |  | -        v-if="
 | 
	
		
			
				|  |  | -          team_status == 'PAY' ||
 | 
	
		
			
				|  |  | -          team_status == 'APPLY' ||
 | 
	
		
			
				|  |  | -          team_status == 'PROGRESS' ||
 | 
	
		
			
				|  |  | -          team_status == 'PREPARE'
 | 
	
		
			
				|  |  | -        "
 | 
	
		
			
				|  |  | -      >
 | 
	
		
			
				|  |  | -        <!-- <h2> -->
 | 
	
		
			
				|  |  | -        <!-- + '报名详情' -->
 | 
	
		
			
				|  |  | -        <!-- <el-page-header @back="onCancel" :content="teamName">
 | 
	
		
			
				|  |  | -              </el-page-header> -->
 | 
	
		
			
				|  |  | -        <!-- </h2> -->
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        <div class="btnList">
 | 
	
		
			
				|  |  | -          <!-- <div class='newBand close'
 | 
	
		
			
				|  |  | -               v-permission="'musicGroup/cancelMusicGroup'"
 | 
	
		
			
				|  |  | -               @click="onClose">停止乐团</div>   v-show="status == 'APPLY'"-->
 | 
	
		
			
				|  |  | -          <div
 | 
	
		
			
				|  |  | -            class="newBand"
 | 
	
		
			
				|  |  | -            @click="payStart"
 | 
	
		
			
				|  |  | -            v-permission="'musicGroup/openPay'"
 | 
	
		
			
				|  |  | -            v-if="team_status == 'APPLY'"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -            开始缴费
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | -          <!-- v-show="status=='PAY'" -->
 | 
	
		
			
				|  |  | -          <div
 | 
	
		
			
				|  |  | -            class="newBand"
 | 
	
		
			
				|  |  | -            v-permission="'musicGroup/found'"
 | 
	
		
			
				|  |  | -            @click="onGoHome"
 | 
	
		
			
				|  |  | -            v-if="team_status == 'APPLY' || team_status == 'PAY'"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -            确认开团
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | -          <div
 | 
	
		
			
				|  |  | -            class="newBand"
 | 
	
		
			
				|  |  | -            v-permission="'musicGroup/extensionPayment'"
 | 
	
		
			
				|  |  | -            @click="extendTime(true)"
 | 
	
		
			
				|  |  | -            v-show="
 | 
	
		
			
				|  |  | -              team_status == 'PAY' ||
 | 
	
		
			
				|  |  | -              team_status == 'PROGRESS' ||
 | 
	
		
			
				|  |  | -              team_status == 'PREPARE'
 | 
	
		
			
				|  |  | -            "
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -            延长缴费
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | -          <div
 | 
	
		
			
				|  |  | -              class="newBand"
 | 
	
		
			
				|  |  | -              v-permission="'musicGroup/extensionApplyExpireDate'"
 | 
	
		
			
				|  |  | -              @click="extendTime(false)"
 | 
	
		
			
				|  |  | -              v-show="
 | 
	
		
			
				|  |  | -                team_status == 'PAY' ||
 | 
	
		
			
				|  |  | -                team_status == 'APPLY' ||
 | 
	
		
			
				|  |  | -                team_status == 'PROGRESS' ||
 | 
	
		
			
				|  |  | -                team_status == 'PREPARE'
 | 
	
		
			
				|  |  | -              "
 | 
	
		
			
				|  |  | -            >
 | 
	
		
			
				|  |  | -              延长报名
 | 
	
		
			
				|  |  | -            </div>
 | 
	
		
			
				|  |  | -          <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
 | 
	
		
			
				|  |  | -          <div class="newBand" @click="onCreateQRCode('rePayment')">
 | 
	
		
			
				|  |  | -            报名链接(无乐器)
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | -          <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
 | 
	
		
			
				|  |  | -          <!-- <div
 | 
	
		
			
				|  |  | -              class="newBand"
 | 
	
		
			
				|  |  | -              v-show="rightList.length > 0"
 | 
	
		
			
				|  |  | -              v-permission="
 | 
	
		
			
				|  |  | -                getFullPermission(
 | 
	
		
			
				|  |  | -                  'studentRegistration/queryStudentApplyDetailExport'
 | 
	
		
			
				|  |  | -                )
 | 
	
		
			
				|  |  | -              "
 | 
	
		
			
				|  |  | -              @click="onDownLoadExecl"
 | 
	
		
			
				|  |  | -            >
 | 
	
		
			
				|  |  | -              报表导出
 | 
	
		
			
				|  |  | -            </div> -->
 | 
	
		
			
				|  |  | -          <!-- <auth
 | 
	
		
			
				|  |  | -              :auths="
 | 
	
		
			
				|  |  | -                'studentRegistration/queryPreApplyList'
 | 
	
		
			
				|  |  | -              "
 | 
	
		
			
				|  |  | -            >
 | 
	
		
			
				|  |  | -              <div
 | 
	
		
			
				|  |  | -                class="newBand"
 | 
	
		
			
				|  |  | -                style="margin-right: 0"
 | 
	
		
			
				|  |  | -                @click="forecastVisible = true"
 | 
	
		
			
				|  |  | -              >
 | 
	
		
			
				|  |  | -                预报名名单
 | 
	
		
			
				|  |  | -              </div>
 | 
	
		
			
				|  |  | -            </auth> -->
 | 
	
		
			
				|  |  | -          <!--    v-permission="getFullPermission('musicGroup/addMusicGroupRegs')" -->
 | 
	
		
			
				|  |  | -          <div
 | 
	
		
			
				|  |  | -            class="newBand"
 | 
	
		
			
				|  |  | -            v-permission="'musicGroup/addMusicGroupRegs'"
 | 
	
		
			
				|  |  | -            @click="mergeVisible = true"
 | 
	
		
			
				|  |  | -            v-show="team_status == 'PAY' || team_status == 'APPLY'"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -            合并学员
 | 
	
		
			
				|  |  | -          </div>
 | 
	
		
			
				|  |  | -        </div>
 | 
	
		
			
				|  |  | -        <p
 | 
	
		
			
				|  |  | -          style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
 | 
	
		
			
				|  |  | -          v-if="
 | 
	
		
			
				|  |  | -            team_status == 'PAY' ||
 | 
	
		
			
				|  |  | -            team_status == 'PROGRESS' ||
 | 
	
		
			
				|  |  | -            team_status == 'PREPARE'
 | 
	
		
			
				|  |  | -          "
 | 
	
		
			
				|  |  | -        >
 | 
	
		
			
				|  |  | -          <!-- 报名截止时间:{{ applyExpireDate | formatTimer }} -->
 | 
	
		
			
				|  |  | -          缴费截止时间:{{ paymentExpireDate | formatTimer }}
 | 
	
		
			
				|  |  | -        </p>
 | 
	
		
			
				|  |  | -      </div>
 | 
	
		
			
				|  |  | -    </div>
 | 
	
		
			
				|  |  |      <div class="banseLeft">
 | 
	
		
			
				|  |  |        <div class="head">乐团基本信息:</div>
 | 
	
		
			
				|  |  |        <!-- <div class="num">乐团编号:dywh01</div> -->
 | 
	
	
		
			
				|  | @@ -467,93 +349,7 @@
 | 
	
		
			
				|  |  |          </div> -->
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |      </div>
 | 
	
		
			
				|  |  | -    <el-dialog title="选择合并乐团" :visible.sync="mergeVisible" width="950px">
 | 
	
		
			
				|  |  | -      <mergeMusic
 | 
	
		
			
				|  |  | -        v-if="mergeVisible"
 | 
	
		
			
				|  |  | -        style="padding: 0 20px"
 | 
	
		
			
				|  |  | -        :organId="organId"
 | 
	
		
			
				|  |  | -        @close="mergeVisible = false"
 | 
	
		
			
				|  |  | -        @submited="gotoStudentList"
 | 
	
		
			
				|  |  | -      />
 | 
	
		
			
				|  |  | -    </el-dialog>
 | 
	
		
			
				|  |  | -    <el-dialog
 | 
	
		
			
				|  |  | -      title="开始缴费"
 | 
	
		
			
				|  |  | -      :visible.sync="paymentStatus"
 | 
	
		
			
				|  |  | -      width="400px"
 | 
	
		
			
				|  |  | -      destroy-on-close
 | 
	
		
			
				|  |  | -    >
 | 
	
		
			
				|  |  | -      <el-form
 | 
	
		
			
				|  |  | -        ref="paymentForm"
 | 
	
		
			
				|  |  | -        class="paymentForm"
 | 
	
		
			
				|  |  | -        :model="paymentForm"
 | 
	
		
			
				|  |  | -        :rules="paymentRules"
 | 
	
		
			
				|  |  | -      >
 | 
	
		
			
				|  |  | -        <el-form-item label="请设置缴费截止日期" prop="paymentExpireDate">
 | 
	
		
			
				|  |  | -          <el-date-picker
 | 
	
		
			
				|  |  | -            v-model.trim="paymentForm.paymentExpireDate"
 | 
	
		
			
				|  |  | -            type="date"
 | 
	
		
			
				|  |  | -            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | -            :picker-options="payDate()"
 | 
	
		
			
				|  |  | -            style="width: 100%"
 | 
	
		
			
				|  |  | -            placeholder="选择日期"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -          </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | -      </el-form>
 | 
	
		
			
				|  |  | -      <div slot="footer" class="dialog-footer">
 | 
	
		
			
				|  |  | -        <el-button @click="paymentStatus = false">取 消</el-button>
 | 
	
		
			
				|  |  | -        <el-button type="primary" @click="onStartPayment('paymentForm')"
 | 
	
		
			
				|  |  | -          >确 定</el-button
 | 
	
		
			
				|  |  | -        >
 | 
	
		
			
				|  |  | -      </div>
 | 
	
		
			
				|  |  | -    </el-dialog>
 | 
	
		
			
				|  |  | -    <el-dialog
 | 
	
		
			
				|  |  | -      :title="!isPay ? '延长报名' : '延长缴费'"
 | 
	
		
			
				|  |  | -      :visible.sync="extendPaymentStatus"
 | 
	
		
			
				|  |  | -      destroy-on-close
 | 
	
		
			
				|  |  | -      width="400px"
 | 
	
		
			
				|  |  | -    >
 | 
	
		
			
				|  |  | -      <el-form :model="extendForm" ref="extendForm" :rules="extendRule">
 | 
	
		
			
				|  |  | -        <el-form-item v-if="isPay" label="延长缴费时间" prop="expireDate">
 | 
	
		
			
				|  |  | -          <el-date-picker
 | 
	
		
			
				|  |  | -            v-model.trim="extendForm.expireDate"
 | 
	
		
			
				|  |  | -            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | -            type="date"
 | 
	
		
			
				|  |  | -            :picker-options="{
 | 
	
		
			
				|  |  | -              firstDayOfWeek: 1,
 | 
	
		
			
				|  |  | -            }"
 | 
	
		
			
				|  |  | -            placeholder="选择日期"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -          </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item label="延长报名时间" v-else prop="expireDate">
 | 
	
		
			
				|  |  | -          <el-date-picker
 | 
	
		
			
				|  |  | -            v-model.trim="extendForm.expireDate"
 | 
	
		
			
				|  |  | -            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | -            type="date"
 | 
	
		
			
				|  |  | -            :picker-options="applyDate"
 | 
	
		
			
				|  |  | -            placeholder="选择日期"
 | 
	
		
			
				|  |  | -          >
 | 
	
		
			
				|  |  | -          </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | -      </el-form>
 | 
	
		
			
				|  |  | -      <div slot="footer" class="dialog-footer">
 | 
	
		
			
				|  |  | -        <el-button @click="extendPaymentStatus = false">取 消</el-button>
 | 
	
		
			
				|  |  | -        <el-button
 | 
	
		
			
				|  |  | -          type="primary"
 | 
	
		
			
				|  |  | -          v-if="isPay"
 | 
	
		
			
				|  |  | -          @click="onExtendPayment('extendForm', isPay)"
 | 
	
		
			
				|  |  | -          >确 定</el-button
 | 
	
		
			
				|  |  | -        >
 | 
	
		
			
				|  |  | -        <el-button
 | 
	
		
			
				|  |  | -          v-else
 | 
	
		
			
				|  |  | -          type="primary"
 | 
	
		
			
				|  |  | -          @click="onExtendPayment('extendForm', isPay)"
 | 
	
		
			
				|  |  | -          >确 定</el-button
 | 
	
		
			
				|  |  | -        >
 | 
	
		
			
				|  |  | -      </div>
 | 
	
		
			
				|  |  | -    </el-dialog>
 | 
	
		
			
				|  |  | -    <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  <script>
 | 
	
	
		
			
				|  | @@ -566,7 +362,8 @@ import {
 | 
	
		
			
				|  |  |    musicGroupOpenPay,
 | 
	
		
			
				|  |  |    extensionPayment,
 | 
	
		
			
				|  |  |     extensionApplyExpire,
 | 
	
		
			
				|  |  | -  findUserByRole
 | 
	
		
			
				|  |  | +  findUserByRole,
 | 
	
		
			
				|  |  | +  getTeacher
 | 
	
		
			
				|  |  |  } from "@/api/buildTeam";
 | 
	
		
			
				|  |  |  import { findTechnician } from "@/api/repairManager";
 | 
	
		
			
				|  |  |  import dayjs from "dayjs";
 | 
	
	
		
			
				|  | @@ -635,12 +432,15 @@ export default {
 | 
	
		
			
				|  |  |        basdisabled: false,
 | 
	
		
			
				|  |  |        // 整合报名中
 | 
	
		
			
				|  |  |        paymentExpireDate: "",
 | 
	
		
			
				|  |  | +         applyExpireDate:null,
 | 
	
		
			
				|  |  |        mergeVisible: false,
 | 
	
		
			
				|  |  |        team_status: "",
 | 
	
		
			
				|  |  |        paymentNum: 0,
 | 
	
		
			
				|  |  |        paymentStatus: false,
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |        paymentForm: {
 | 
	
		
			
				|  |  |          paymentExpireDate: null,
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          // feeType: null
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        paymentRules: {
 | 
	
	
		
			
				|  | @@ -712,6 +512,7 @@ export default {
 | 
	
		
			
				|  |  |    deactivated() {},
 | 
	
		
			
				|  |  |    beforeDestroy() {
 | 
	
		
			
				|  |  |      this.topFrom.paymentExpireDate = this.paymentExpireDate;
 | 
	
		
			
				|  |  | +    console.log( this.topFrom.paymentExpireDate )
 | 
	
		
			
				|  |  |      sessionStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -797,6 +598,9 @@ export default {
 | 
	
		
			
				|  |  |            });
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |            this.topFrom = sotrage;
 | 
	
		
			
				|  |  | +          this.applyExpireDate = sotrage.time
 | 
	
		
			
				|  |  | +          this.paymentExpireDate = Storage.paymentExpireDate
 | 
	
		
			
				|  |  | +          console.log( sotrage,this.applyExpireDate,this.paymentExpireDate)
 | 
	
		
			
				|  |  |            if (this.topFrom.section) {
 | 
	
		
			
				|  |  |              // 获取员工
 | 
	
		
			
				|  |  |               this.getBaseList(this.topFrom.section)
 | 
	
	
		
			
				|  | @@ -1232,6 +1036,7 @@ export default {
 | 
	
		
			
				|  |  |                  ? res.data.musicGroup.feeType
 | 
	
		
			
				|  |  |                  : null;
 | 
	
		
			
				|  |  |                this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
 | 
	
		
			
				|  |  | +              this.applyExpireDate = res.data.musicGroup.applyExpireDate;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    computed: {
 | 
	
	
		
			
				|  | @@ -1405,18 +1210,9 @@ export default {
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  </style>
 | 
	
		
			
				|  |  | -<style lang="scss" scoped>
 | 
	
		
			
				|  |  | -.btnList {
 | 
	
		
			
				|  |  | -  display: flex;
 | 
	
		
			
				|  |  | -  flex-direction: row;
 | 
	
		
			
				|  |  | -  justify-content: flex-start;
 | 
	
		
			
				|  |  | -  align-items: center;
 | 
	
		
			
				|  |  | -  flex-wrap: wrap;
 | 
	
		
			
				|  |  | -  & > div {
 | 
	
		
			
				|  |  | -    margin-right: 15px;
 | 
	
		
			
				|  |  | -    margin-bottom: 10px;
 | 
	
		
			
				|  |  | -  }
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  | +<style scoped lang="scss">
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  /deep/.el-date-editor {
 | 
	
		
			
				|  |  |    width: 180px !important;
 | 
	
		
			
				|  |  |  }
 |