浏览代码

Merge branch '10/23-test' into yuetuan

wolyshaw 4 年之前
父节点
当前提交
7ecff071be

+ 0 - 1
src/utils/searchArray.js

@@ -217,7 +217,6 @@ function getValueForKey(obj){
   for(let k in obj){
     arr.push({label:obj[k],value:k})
   }
-  console.log(arr)
   return arr
 }
 

+ 1 - 1
src/views/auditList/index.vue

@@ -72,7 +72,7 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-          <el-table-column type="selection" width="55"></el-table-column>
+          <!-- <el-table-column type="selection" width="55"></el-table-column> -->
           <el-table-column
             align="center"
             prop="organName"

+ 7 - 0
src/views/resetTeaming/api.js

@@ -32,3 +32,10 @@ export const musicGroupPaymentCalenderDetailBatchAdd = data => request2({
   data: data,
   method: 'post',
 })
+
+// musicGroupPaymentCalender/update
+export const musicGroupPaymentCalenderDetailBatchUpdate = data => request2({
+  url: '/api-web/musicGroupPaymentCalender/update',
+  data: data,
+  method: 'post',
+})

+ 355 - 321
src/views/resetTeaming/components/resetPayList.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="m-core">
-        <el-form :inline="true" :model="searchForm">
+    <el-form :inline="true" :model="searchForm">
       <el-form-item>
         <el-select
           placeholder="订单类型"
@@ -10,7 +10,7 @@
           filterable
         >
           <el-option
-            v-for="(item, index) in payOrderTypeList"
+            v-for="(item, index) in payOrderTypeLists"
             :label="item.label"
             :value="item.value"
             :key="index"
@@ -36,217 +36,269 @@
       <div class="newBand"
            v-permission="'/studentPayBase'"
            @click="setStudentPay">学员缴费设置</div>
-      <div class="newBand"
+      <!-- <div class="newBand"
       v-if="!isNewGropu"
-           @click="onCreateQRCode">续费二维码</div>
+           @click="onCreateQRCode">续费二维码</div> -->
     </div>
     <div class="tableWrap">
-      <el-table style="width: 100%"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                :data="tableList">
-        <el-table-column align="center"
-                         prop="startPaymentDate"
-                         width="120"
-                         label="缴费开始日期">
+      <el-table
+        style="width: 100%"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        :data="tableList"
+      >
+        <el-table-column
+          align="center"
+          prop="startPaymentDate"
+          width="120"
+          label="缴费开始日期"
+        >
           <template slot-scope="scope">
             <div>
-              {{scope.row.startPaymentDate | formatTimer}}
+              {{ scope.row.startPaymentDate | formatTimer }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         width="120"
-                         prop="deadlinePaymentDate"
-                         label="缴费结束日期">
-
+        <el-table-column
+          align="center"
+          width="120"
+          prop="deadlinePaymentDate"
+          label="缴费结束日期"
+        >
           <template slot-scope="scope">
             <div>
-              {{scope.row.deadlinePaymentDate | formatTimer}}
+              {{ scope.row.deadlinePaymentDate | formatTimer }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="expectNum"
-                         width="120"
-                         label="预计缴费人数"></el-table-column>
-        <el-table-column align="center"
-                         prop="paymentPattern"
-                         label="缴费方式">
+        <el-table-column
+          align="center"
+          prop="expectNum"
+          width="120"
+          label="预计缴费人数"
+        ></el-table-column>
+        <el-table-column align="center" prop="paymentPattern" label="缴费方式">
           <template slot-scope="scope">
             <div>
-              {{scope.row.paymentPattern | teamPayStatus}}
+              {{ scope.row.paymentPattern | teamPayStatus }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="paymentValidStartDate"
-                         width="150"
-                         label="缴费有效期开始日期">
+        <el-table-column
+          align="center"
+          prop="paymentValidStartDate"
+          width="150"
+          label="缴费有效期开始日期"
+        >
           <template slot-scope="scope">
             <div>
-              {{scope.row.paymentValidStartDate | formatTimer}}
+              {{ scope.row.paymentValidStartDate | formatTimer }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="paymentValidEndDate"
-                         width="150"
-                         label="缴费有效期结束日期">
+        <el-table-column
+          align="center"
+          prop="paymentValidEndDate"
+          width="150"
+          label="缴费有效期结束日期"
+        >
           <template slot-scope="scope">
             <div>
-              {{scope.row.paymentValidEndDate | formatTimer}}
+              {{ scope.row.paymentValidEndDate | formatTimer }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="actualNum"
-                         width="120"
-                         label="实际缴费人数"></el-table-column>
-        <el-table-column align="center"
-                         prop="status"
-                         label="缴费状态">
+        <el-table-column
+          align="center"
+          prop="actualNum"
+          width="120"
+          label="实际缴费人数"
+        ></el-table-column>
+        <el-table-column align="center" prop="status" label="缴费状态">
           <template slot-scope="scope">
             <div>
-              {{scope.row.status | payTypeStatus}}
+              {{ scope.row.status | payTypeStatus }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="isGiveMusicNetwork"
-                         width="120"
-                         label="是否赠送网管课">
+        <el-table-column
+          align="center"
+          prop="isGiveMusicNetwork"
+          width="120"
+          label="是否赠送网管课"
+        >
           <template slot-scope="scope">
             <div>
-              {{scope.row.isGiveMusicNetwork ? '是' : '否'}}
+              {{ scope.row.isGiveMusicNetwork ? "是" : "否" }}
             </div>
           </template>
         </el-table-column>
         <el-table-column align="center"
                          prop="memo"
                          label="备注"></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" min-width="150px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'/strudentPayInfo'">查看</el-button>
               <el-button type="text"
-                         v-if="scope.row.paymentStatus == 0"
+                         v-if="scope.row.status == 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/updateStartTime'"
                          @click="resetPay(scope.row)">修改</el-button>
-              <el-button type="text"
-                         v-permission="'musicGroupPaymentCalender/del'"
-                         v-if="scope.row.paymentStatus == 0"
-                         @click="detelePay(scope.row)">删除</el-button>
+
+              <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
+      <pagination
+        :total="rules.total"
+        :page.sync="rules.page"
+        :limit.sync="rules.limit"
+        :page-sizes="rules.page_size"
+        @pagination="getList"
+      />
     </div>
-    <el-dialog :visible.sync="payVisible"
-               :close-on-click-modal="false"
-               width="500px"
-               :title="diTitle">
-      <el-form :model="payForm"
-               :inline="true"
-               label-width="120px"
-               label-position="right"
-               ref='payForm'>
-        <el-form-item label="缴费开始日期"
-                      :rules="[{ required: true, message: '请设置缴费开始日期',trigger: 'blur'}]"
-                      prop="startPaymentDate">
-          <el-date-picker v-model.trim="payForm.startPaymentDate"
-                          @change="changeStartTime"
-                          type="date"
-                          :picker-options="pickerOptions"
-                          value-format="yyyy-MM-dd"
-                          placeholder="开始日期"></el-date-picker>
+    <el-dialog
+      :visible.sync="payVisible"
+      :close-on-click-modal="false"
+      width="500px"
+      :title="diTitle"
+    >
+      <el-form
+        :model="payForm"
+        :inline="true"
+        label-width="120px"
+        label-position="right"
+        ref="payForm"
+      >
+        <el-form-item
+          label="缴费开始日期"
+          :rules="[
+            { required: true, message: '请设置缴费开始日期', trigger: 'blur' },
+          ]"
+          prop="startPaymentDate"
+        >
+          <el-date-picker
+            v-model.trim="payForm.startPaymentDate"
+            @change="changeStartTime"
+            type="date"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
+            placeholder="开始日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="缴费结束日期"
-                      :rules="[{ required: true, message: '请设置缴费结束日期',trigger: 'blur'}]"
-                      prop="deadlinePaymentDate">
-          <el-date-picker v-model.trim="payForm.deadlinePaymentDate"
-                          type="date"
-                          :picker-options="beginDate(payForm.startPaymentDate)"
-                          value-format="yyyy-MM-dd"
-                          placeholder="结束日期"></el-date-picker>
+        <el-form-item
+          label="缴费结束日期"
+          :rules="[
+            { required: true, message: '请设置缴费结束日期', trigger: 'blur' },
+          ]"
+          prop="deadlinePaymentDate"
+        >
+          <el-date-picker
+            v-model.trim="payForm.deadlinePaymentDate"
+            type="date"
+            :picker-options="beginDate(payForm.startPaymentDate)"
+            value-format="yyyy-MM-dd"
+            placeholder="结束日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="缴费方式"
-                      prop="paymentPattern"
-                      :rules="[{ required: true, message: '请选择缴费方式'},]">
-          <el-select placeholder="缴费方式"
-                     style="width: 220px"
-                     clearable
-                     filterable
-                     @change="paymentPatternChange"
-                     v-model.trim="payForm.paymentPattern">
-            <el-option :value="0"
-                       label="按月"></el-option>
-            <el-option :value="1"
-                       label="按季"></el-option>
-            <el-option :value="2"
-                       label="一次性"></el-option>
+        <el-form-item
+          label="缴费方式"
+          prop="paymentPattern"
+          :rules="[{ required: true, message: '请选择缴费方式' }]"
+        >
+          <el-select
+            placeholder="缴费方式"
+            style="width: 220px"
+            clearable
+            filterable
+            @change="paymentPatternChange"
+            v-model.trim="payForm.paymentPattern"
+          >
+            <el-option :value="0" label="按月"></el-option>
+            <el-option :value="1" label="按季"></el-option>
+            <el-option :value="2" label="一次性"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="缴费有效期开始"
-                      :rules="[{ required: true, message: '请设置缴费有效期开始日期',trigger: 'blur'}]"
-                      prop="paymentValidStartDate">
-          <el-date-picker v-model.trim="payForm.paymentValidStartDate"
-                          type="date"
-                          @change="changePaymentStartTime"
-                          :picker-options="pickerOptions"
-                          value-format="yyyy-MM-dd"
-                          placeholder="有效期开始日期"></el-date-picker>
+        <el-form-item
+          label="缴费有效期开始"
+          :rules="[
+            {
+              required: true,
+              message: '请设置缴费有效期开始日期',
+              trigger: 'blur',
+            },
+          ]"
+          prop="paymentValidStartDate"
+        >
+          <el-date-picker
+            v-model.trim="payForm.paymentValidStartDate"
+            type="date"
+            @change="changePaymentStartTime"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
+            placeholder="有效期开始日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="缴费有效期结束"
-                      :rules="[{ required: payForm.paymentPattern !== 2, message: '请设置缴费有效期结束日期',trigger: 'blur'}]"
-                      prop="paymentValidEndDate">
-          <el-date-picker v-model.trim="payForm.paymentValidEndDate"
-                          type="date"
-                          :disabled="payForm.paymentPattern === 2"
-                          :picker-options="beginDate(payForm.paymentValidStartDate)"
-                          value-format="yyyy-MM-dd"
-                          placeholder="有效期结束日期"></el-date-picker>
+        <el-form-item
+          label="缴费有效期结束"
+          :rules="[
+            {
+              required: payForm.paymentPattern !== 2,
+              message: '请设置缴费有效期结束日期',
+              trigger: 'blur',
+            },
+          ]"
+          prop="paymentValidEndDate"
+        >
+          <el-date-picker
+            v-model.trim="payForm.paymentValidEndDate"
+            type="date"
+            :disabled="payForm.paymentPattern === 2"
+            :picker-options="beginDate(payForm.paymentValidStartDate)"
+            value-format="yyyy-MM-dd"
+            placeholder="有效期结束日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="收费类型"
-                      v-if='isNew'
-                      :rules="[{ required: true, message: '请选择收费类型',trigger: 'blur'}]"
-                      prop="type">
-          <el-select v-model.trim="payForm.type"
-                     style="width:220px!important;"
-                     placeholder="课程类型">
-            <el-option label="线上"
-                       value="ONLINE"></el-option>
-            <el-option label="线下"
-                       value="OFFLINE"></el-option>
+        <el-form-item
+          label="收费类型"
+          v-if="isNew"
+          :rules="[
+            { required: true, message: '请选择收费类型', trigger: 'blur' },
+          ]"
+          prop="type"
+        >
+          <el-select
+            v-model.trim="payForm.type"
+            style="width: 220px !important"
+            placeholder="课程类型"
+          >
+            <el-option label="线上" value="ONLINE"></el-option>
+            <el-option label="线下" value="OFFLINE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="备注"
-                      v-if='isNew'
-                      :rules="[{ required: true, message: '请填写备注',trigger: 'blur'}]"
-                      prop="memo">
-          <el-input type="textarea"
-                    style="width:220px!important;"
-                    :rows="4"
-                    placeholder="请填写备注"
-                    v-model="payForm.memo"></el-input>
-
+        <el-form-item
+          label="备注"
+          v-if="isNew"
+          :rules="[{ required: true, message: '请填写备注', trigger: 'blur' }]"
+          prop="memo"
+        >
+          <el-input
+            type="textarea"
+            style="width: 220px !important"
+            :rows="4"
+            placeholder="请填写备注"
+            v-model="payForm.memo"
+          ></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer"
-           class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="payVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   v-if="isNew"
-                   @click="newPayInfo">确 定</el-button>
-        <el-button type="primary"
-                   v-else
-                   @click="resetPayDate">确 定</el-button>
+        <el-button type="primary" v-if="isNew" @click="newPayInfo"
+          >确 定</el-button
+        >
+        <el-button type="primary" v-else @click="resetPayDate">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -263,18 +315,22 @@
         destroy-on-close
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="reviewVisible = false">关闭</el-button>
+        <el-button type="primary" @click="reviewVisible = false"
+          >关闭</el-button
+        >
       </div>
     </el-dialog>
     <el-dialog
       :title="payFormTitle"
       :visible.sync="userVisible"
       width="800px"
-      destroy-on-close
+      
     >
       <userPayForm
+      v-if="userVisible"
         @close="userVisible = false"
         @submited="payedSubmited"
+        :rowDetail='activeRow'
         :type="payFormType"
         :baseInfo="baseInfo"
         :paymentType="isNewGropu ? 0 : undefined"
@@ -282,17 +338,6 @@
       />
     </el-dialog>
 
-    <el-dialog title="续费二维码"
-               :visible.sync="qrcodeStatus"
-               width="300px">
-      <div class="left-code">
-        <div id="qrcode"
-             class="qrcode code"
-             ref="qrCodeUrl"></div>
-        <p class="code-url"
-           v-if="codeUrl">{{ codeUrl }}</p>
-      </div>
-    </el-dialog>
     <el-dialog title="学员选择"
                :visible.sync="chioseStudentVisible"
                destroy-on-close
@@ -304,11 +349,11 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="chioseStudentVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitNewPay">确 定</el-button>
-
+        <el-button type="primary" @click="submitNewPay">确 定</el-button>
       </div>
     </el-dialog>
+
+    <qr-code v-model="qrcodeStatus" title="续费二维码" :codeUrl="codeUrl" />
   </div>
 </template>
 <script>
@@ -318,7 +363,7 @@ import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import qs from "qs";
 import dayjs from 'dayjs'
-import QRCode from 'qrcodejs2'
+import QrCode from "@/components/QrCode/index";
 import { vaildStudentUrl } from '@/utils/validate'
 import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender } from "@/api/buildTeam";
 import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd } from '../api'
@@ -331,24 +376,25 @@ import { userPaymentType } from '@/constant'
 import { objectToOptions } from '@/utils'
 import { payOrderTypeList}  from "@/utils/searchArray";
 export default {
-  props: ['baseInfo','isNewGropu'],
+  props: ["baseInfo", "isNewGropu"],
   components: {
     pagination,
     setStudentFee,
     userPayForm,
     schoolPayForm,
+    QrCode,
     review,
-    reviewDetail
+    reviewDetail,
   },
-  data () {
+  data() {
     return {
       musicGroupStu: [],
-      payFormType: 'user',
+      payFormType: "user",
       userVisible: false,
       schoolVisible: false,
       reviewVisible: false,
       searchForm: {
-        payUserType: null
+        payUserType: null,
       },
       viewDetail: null,
       tableList: [{}],
@@ -357,10 +403,10 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       isInit: false,
-      diTitle: '新增缴费',
+      diTitle: "新增缴费",
       payVisible: false,
       payForm: {
         startPaymentDate: null,
@@ -369,159 +415,138 @@ export default {
         paymentValidStartDate: null,
         paymentValidEndDate: null,
         type: null,
-        memo: null
+        memo: null,
       },
       isNew: false,
       activeRow: null,
       pickerOptions: {
         firstDayOfWeek: 1,
-        disabledDate (time) {
+        disabledDate(time) {
           return time.getTime() + 86400000 <= new Date().getTime();
-        }
+        },
       },
       qrcodeStatus: false, // 生成二维码
-      qrcodes: true,
-      qrcode: null,
       codeUrl: null,
       chioseStudentVisible: false,
       chioseStudentList: [],
       clearStduent: true,
-      musicGroupPaymentCalenderId: '',
-      payOrderTypeList,
+      musicGroupPaymentCalenderId: "",
+      payOrderTypeLists: payOrderTypeList,
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created () { },
+  created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
-  async mounted () {
+  async mounted() {
     // 获取分部
-    this.init();
 
+    this.init();
+    console.log(this.baseInfo)
   },
   computed: {
     payOrderTypeList() {
-      return objectToOptions(userPaymentType)
+      return objectToOptions(userPaymentType);
     },
     payFormTitle() {
-      return this.payFormType === 'user' ? '新增学员缴费' : '新增学校缴费'
-    }
+      if (this.isNew) {
+        return this.payFormType === "user" ? "新增学员缴费" : "新增学校缴费";
+      } else {
+        return this.payFormType === "user" ? "修改学员缴费" : "修改学校缴费";
+      }
+    },
   },
-  activated () {
+  activated() {
     this.init();
   },
   methods: {
-    async init () {
+    async init() {
       try {
         const res = await getMusicGroupStu({
           musicGroupId: this.$route.query.id,
-        })
-        console.log(res)
+        });
+
       } catch (error) {}
-      this.getList()
+      this.getList();
     },
     newUserPay() {
-      this.payFormType = 'user'
-      this.userVisible = true
+      this.payFormType = "user";
+      this.isNew = true;
+      this.activeRow = null
+      this.userVisible = true;
+      
     },
     newSchoolPay() {
-      this.payFormType = 'school'
-      this.userVisible = true
+      this.payFormType = "school";
+      this.isNew = true;
+      this.activeRow = null
+      this.userVisible = true;
     },
     getList () {
       let musicGroupId = this.$route.query.id
       return musicGroupPaymentCalenderQueryPage({ page: this.rules.page, rows: this.rules.limit, musicGroupId, payUserType:this.searchForm.payUserType }).then(res => {
         if (res.code == 200) {
-          this.rules.total = res.data.total
+          this.rules.total = res.data.total;
           this.tableList = res.data.rows;
         }
-      })
+      });
     },
-    paymentPatternChange (val) {
+    paymentPatternChange(val) {
       if (val === 2) {
-        this.payForm.paymentValidEndDate = null
+        this.payForm.paymentValidEndDate = null;
       }
     },
-    async payedSubmited(data) {
-      try {
-        await this.getList()
-        this.chioseStudentVisible = true
-        if (data) {
-          this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId
-        }
-      } catch (error) {}
-    },
-    onCreateQRCode () { // 生成报名二维码
+    onCreateQRCode (row) { // 生成报名二维码
       this.qrcodeStatus = true
-      let id = this.$route.query.id
-
-      let teamName = this.$route.query.name
-      setTimeout(() => {
-        document.getElementById('qrcode').innerHTML = '';
-        this.qrcode = new QRCode('qrcode', {
-          width: 200,
-          height: 200,
-          colorDark: '#000000',
-          colorLight: '#ffffff',
-          correctLevel: QRCode.CorrectLevel.H
-        })
-        this.qrcode.makeCode(vaildStudentUrl() + '/#/SporadicLogin?type=renew&musicGroupId=' + id)
-        this.codeUrl = vaildStudentUrl() + '/#/SporadicLogin?type=renew&musicGroupId=' + id
-      }, 500)
+      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id
     },
-    chioseStudent (val) {
+    chioseStudent(val) {
       this.chioseStudentList = val;
     },
-    newPay () {
-      this.diTitle = '新增缴费'
-      this.isNew = true
+    newPay() {
+      this.diTitle = "新增缴费";
+      this.isNew = true;
       this.payVisible = true;
     },
-    resetPay (row) {
-      this.diTitle = '修改缴费'
-      this.isNew = false
-      this.activeRow = row
-      this.payVisible = true;
-      this.payForm = {
-        ...this.payForm,
-        startPaymentDate: row.startPaymentDate,
-        deadlinePaymentDate: row.deadlinePaymentDate,
-        paymentPattern: row.paymentPattern,
-        paymentValidStartDate: row.paymentValidStartDate,
-        paymentValidEndDate: row.paymentValidEndDate,
-      }
+    resetPay(row) {
+      this.diTitle = "修改缴费";
+      this.isNew = false;
+      this.activeRow = row;
+      this.payFormType = row.payUserType==='SCHOOL'?'school':'user'
+      this.userVisible = true;
     },
-    detelePay (row) {
+    detelePay(row) {
       let id = row.id;
-      this.$confirm(`确定删除该缴费周期?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        delMusicGroupPaymentCalender({ id }).then(res => {
-          if (res.code == 200) {
-            this.$message.success('删除成功')
-            this.getList();
-          }
+      this.$confirm(`确定删除该缴费周期?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delMusicGroupPaymentCalender({ id }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("删除成功");
+              this.getList();
+            }
+          });
         })
-      }).catch(() => { })
-
+        .catch(() => {});
     },
-    lookDetail (row) {
-      let query = this.$route.query
+    lookDetail(row) {
+      let query = this.$route.query;
       this.$route.query.paymentId = row.id;
-      this.viewDetail = row
-      if (row.payUserType === 'SCHOOL') {
-        this.reviewVisible = row
+      this.viewDetail = row;
+      if (row.payUserType === "SCHOOL") {
+        this.reviewVisible = true;
       } else {
-        this.$router.push({ path: '/business/strudentPayInfo', query })
+        this.$router.push({ path: "/business/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 });
     },
-    newPayInfo () {
-      this.$refs['payForm'].validate(res => {
+    newPayInfo() {
+      this.$refs["payForm"].validate((res) => {
         if (res) {
           /**
            *   payForm: {
@@ -532,94 +557,103 @@ export default {
       },
            *
            */
-          this.chioseStudentVisible = true
-          return
-
+          this.chioseStudentVisible = true;
+          return;
         }
-      })
+      });
     },
-    submitNewPay () {
+    submitNewPay() {
       if (this.chioseStudentList.length < 1) {
-        this.$message.error('请至少选择一名学员')
-        return
+        this.$message.error("请至少选择一名学员");
+        return;
       }
 
-      let obj = {}
-      obj.userIdList = this.chioseStudentList.map(stu => {
-        return stu.userId
-      })
-      obj.musicGroupPaymentCalenderId = this.musicGroupPaymentCalenderId
-      musicGroupPaymentCalenderDetailBatchAdd(obj).then(res => {
+      let obj = {};
+      obj.userIdList = this.chioseStudentList.map((stu) => {
+        return stu.userId;
+      });
+      obj.musicGroupPaymentCalenderId = this.musicGroupPaymentCalenderId;
+      musicGroupPaymentCalenderDetailBatchAdd(obj).then((res) => {
         if (res.code == 200) {
-          this.$message.success('添加成功')
-          this.$refs.setStudentFee.clearTable()
+          this.$message.success("添加成功");
+          this.$refs.setStudentFee.clearTable();
           this.payVisible = false;
           this.chioseStudentVisible = false;
-          this.getList()
+          this.getList();
         }
-      })
-
-
+      });
     },
-    resetPayDate () {
+    resetPayDate() {
       resetMusicGroupPaymentCalender({
         id: this.activeRow.id,
         startPaymentDate: this.payForm.startPaymentDate,
         deadlinePaymentDate: this.payForm.deadlinePaymentDate,
-        paymentValidStartDate: this.payForm.paymentValidStartDate ? dayjs(this.payForm.paymentValidStartDate).format('YYYY-MM-DD') : this.payForm.paymentValidStartDate,
-        paymentValidEndDate: this.payForm.paymentValidEndDate ? dayjs(this.payForm.paymentValidEndDate).format('YYYY-MM-DD') : this.payForm.paymentValidEndDate,
+        paymentValidStartDate: this.payForm.paymentValidStartDate
+          ? dayjs(this.payForm.paymentValidStartDate).format("YYYY-MM-DD")
+          : this.payForm.paymentValidStartDate,
+        paymentValidEndDate: this.payForm.paymentValidEndDate
+          ? dayjs(this.payForm.paymentValidEndDate).format("YYYY-MM-DD")
+          : this.payForm.paymentValidEndDate,
         paymentPattern: this.payForm.paymentPattern,
-      }).then(res => {
+      }).then((res) => {
         if (res.code == 200) {
-          this.$message.success('修改成功')
+          this.$message.success("修改成功");
           this.payVisible = false;
-          this.getList()
+          this.getList();
         }
-      })
+      });
     },
-    changeStartTime (val) {
-      this.payForm.deadlinePaymentDate = this.dateAddDays(val, 3)
+    changeStartTime(val) {
+      this.payForm.deadlinePaymentDate = this.dateAddDays(val, 3);
     },
-    changePaymentStartTime (val) {
-      this.payForm.paymentValidEndDate = null
+    changePaymentStartTime(val) {
+      this.payForm.paymentValidEndDate = null;
     },
-    dateAddDays (dataStr, dayCount) {
+    dateAddDays(dataStr, dayCount) {
       let strdate = dataStr; //日期字符串
-      let isdate = new Date(strdate.replace(/-/g, "/"));  //把日期字符串转换成日期格式
-      isdate = new Date((isdate / 1000 + (86400 * dayCount)) * 1000);  //日期加1天
-      let pdate = isdate.getFullYear() + "-" + (isdate.getMonth() + 1) + "-" + (isdate.getDate());   //把日期格式转换成字符串
+      let isdate = new Date(strdate.replace(/-/g, "/")); //把日期字符串转换成日期格式
+      isdate = new Date((isdate / 1000 + 86400 * dayCount) * 1000); //日期加1天
+      let pdate =
+        isdate.getFullYear() +
+        "-" +
+        (isdate.getMonth() + 1) +
+        "-" +
+        isdate.getDate(); //把日期格式转换成字符串
       return pdate;
     },
-    beginDate (end) {
+    beginDate(end) {
       return {
         firstDayOfWeek: 1,
-        disabledDate (time) {
+        disabledDate(time) {
           if (end) {
-            return new Date(end).getTime() - 86400000 >= time.getTime()
+            return new Date(end).getTime() - 86400000 >= time.getTime();
           } else {
-            return time.getTime() + 86400000 < Date.now()
+            return time.getTime() + 86400000 < Date.now();
             //开始时间不选时,结束时间最大值小于等于当天
           }
-        }
-      }
+        },
+      };
     },
-    search(){
+    search() {
       this.rules.page = 1;
-      this.getList()
+      this.getList();
+    },
+    onReSet() {
+      this.searchForm = { payUserType: null };
+    },
+        async payedSubmited(data) {
+      try {
+        await this.getList();
+        this.chioseStudentVisible = true;
+        if (data) {
+          this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
+        }
+      } catch (error) {}
     },
-    onReSet(){
-      this.searchForm = {payUserType: null}
-    }
-
   },
   watch: {
     chioseStudentVisible() {
-      this.chioseStudentList = []
-    },
-    qrcodeStatus (val) {
-      if (!val) {
-        this.qrcode.clear()
-      }
+      this.chioseStudentList = [];
     },
     payVisible (val) {
       if (!val) {
@@ -630,12 +664,12 @@ export default {
           paymentValidEndDate: null,
           type: null,
           memo: null,
-          deadlinePaymentDate: null
-        }
-        this.$refs['payForm'].resetFields()
+          deadlinePaymentDate: null,
+        };
+        this.$refs["payForm"].resetFields();
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

+ 5 - 3
src/views/resetTeaming/index.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <el-page-header @back="onCancel"
-                      content="乐团修改"></el-page-header>
+                      :content="teamName"></el-page-header>
 
     </h2>
     <div class="m-core">
@@ -14,7 +14,7 @@
                      v-if="permission('/resetTeaming/teamBaseInfo')"
                      name="1">
           <teamBaseInfo v-if="activeIndex == 1"
-                        @getBaseInfo="getBaseInfo"
+                        @getBaseInfo="getBaseInfo" 
                         :baseInfo="baseInfo"
                         @getName='getName' />
         </el-tab-pane>
@@ -81,7 +81,8 @@ export default {
       // }
       Fsearch: null,
       Frules: null,
-      name: null
+      name: null,
+      teamName:'乐团修改'
     }
   },
   created () {
@@ -119,6 +120,7 @@ export default {
     },
     getBaseInfo(baseInfo) {
       this.baseInfo = baseInfo
+      this.teamName = baseInfo.musicGroup.name
     },
     handleClick (val) {
       this.activeIndex = val.name

+ 177 - 131
src/views/resetTeaming/modals/user-pay-form.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <el-alert
-      title="课程信息设置"
-      :closable="false"
-      class="alert"
-      type="info">
+    <el-alert title="课程信息设置" :closable="false" class="alert" type="info">
     </el-alert>
     <userBaseinfo
       :form.sync="form"
@@ -21,7 +17,8 @@
         title="加课信息设置"
         :closable="false"
         class="alert"
-        type="info">
+        type="info"
+      >
       </el-alert>
       <extraClass
         :form="eclass"
@@ -43,11 +40,7 @@
       :isDisabled="form.leixing === '1' || paymentType == '0'"
     />
     <template>
-      <el-alert
-        title="缴费设置"
-        :closable="false"
-        class="alert"
-        type="info">
+      <el-alert title="缴费设置" :closable="false" class="alert" type="info">
       </el-alert>
       <paymentCycle
         ref="cycle"
@@ -57,22 +50,12 @@
         :isDisabled="form.leixing === '1' || paymentType == '0'"
       />
     </template>
-    <el-alert
-      title="其它"
-      :closable="false"
-      class="alert"
-      type="info">
+    <el-alert title="其它" :closable="false" class="alert" type="info">
     </el-alert>
-    <otherform
-      :form="other"
-      ref="other"
-    />
+    <otherform :form="other" ref="other" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="$listeners.close">取 消</el-button>
-      <el-button
-        type="primary"
-        @click="submit"
-        >下一步</el-button>
+      <el-button type="primary" @click="submit">下一步</el-button>
     </div>
     <el-dialog
       :title="nextTitle"
@@ -80,44 +63,49 @@
       width="600px"
       append-to-body
     >
-      <classrooms
-        @close="closeNext"
-      />
+      <classrooms @close="closeNext" />
     </el-dialog>
   </div>
 </template>
 <script>
-import { chargeTypeList, musicGroupOrganizationCourseSettingsQueryPage } from '@/api/specialSetting'
-import { musicGroupPaymentCalenderAdd } from '../api'
-import { getTimes } from '@/utils'
-import userBaseinfo from './user-baseinfo'
-import paymentCycle from './payment-cycle'
-import extraClass from './extra-class'
-import classrooms from './classrooms'
-import otherform from './other'
+import {
+  chargeTypeList,
+  musicGroupOrganizationCourseSettingsQueryPage,
+} from "@/api/specialSetting";
+import {
+  musicGroupPaymentCalenderAdd,
+  musicGroupPaymentCalenderDetailBatchUpdate,
+} from "../api";
+import { getTimes } from "@/utils";
+import userBaseinfo from "./user-baseinfo";
+import paymentCycle from "./payment-cycle";
+import extraClass from "./extra-class";
+import classrooms from "./classrooms";
+import otherform from "./other";
 
 const paymentTypeFormat = {
-  0: 'MUSIC_APPLY',
-  1: 'MUSIC_RENEW',
-  2: 'ADD_COURSE',
-  3: 'ADD_STUDENT',
-}
+  0: "MUSIC_APPLY",
+  1: "MUSIC_RENEW",
+  2: "ADD_COURSE",
+  3: "ADD_STUDENT",
+};
 
 export default {
-  props: ['type', 'musicGroupId', 'baseInfo', 'paymentType'],
+  props: ["type", "musicGroupId", "baseInfo", "paymentType", "rowDetail"],
   components: {
     userBaseinfo,
     paymentCycle,
     extraClass,
     classrooms,
-    otherform
+    otherform,
   },
   data() {
     return {
       options: [],
       form: {
-        payUserType: this.type === 'user' ? 'STUDENT' : 'SCHOOL',
-        leixing: '1',
+        payUserType: this.type === "user" ? "STUDENT" : "SCHOOL",
+        leixing: "1",
+        musicGroupOrganizationCourseSettingId: null,
       },
       other: {},
       cycles: [{}],
@@ -127,162 +115,220 @@ export default {
       nextVisible: false,
       typeList: [],
       charges: [],
-    }
+    };
   },
   computed: {
     isCommon() {
-      return this.form.leixing === '1'
+      return this.form.leixing === "1";
     },
     isDisabled() {
-      console.log(this.form.leixing === '1' || String(this.paymentType) === '0')
-      return this.form.leixing === '1' || String(this.paymentType) === '0'
+      return this.form.leixing === "1" || String(this.paymentType) === "0";
     },
     isUserType() {
-      return this.type === 'user'
+      return this.type === "user";
     },
     nextTitle() {
-      return this.isCommon ? '乐团课程-班级选择' : '临时加课-班级选择'
+      return this.isCommon ? "乐团课程-班级选择" : "临时加课-班级选择";
     },
     chargesById() {
-      const data = {}
+      const data = {};
       for (const item of this.charges) {
-        data[item.id] = item
+        data[item.id] = item;
       }
-      return data
+      return data;
     },
   },
   watch: {
     type() {
-      this.$set(this.form, 'payUserType', this.type === 'user' ? 'STUDENT' : 'SCHOOL')
+      this.$set(
+        this.form,
+        "payUserType",
+        this.type === "user" ? "STUDENT" : "SCHOOL"
+      );
     },
-    baseInfo() {
-      this.getCharges()
+    baseInfo(val) {
+      this.getCharges();
     },
-    'form.leixing'() {
-      this.cycles = [{}]
-      this.collapse = [0]
-      this.cycle = {}
-      this.cycle.paymentAmount = ''
-      if (this.form.leixing === '1') {
-        this.eclass = []
-      } else if (this.form.leixing === '2') {
-        this.eclass = [{}]
-        this.$set(this.form, 'musicGroupOrganizationCourseSettingId', '')
+    "form.leixing"() {
+      this.cycles = [{}];
+      this.collapse = [0];
+      this.cycle = {};
+      this.cycle.paymentAmount = "";
+      if (this.form.leixing === "1") {
+        this.eclass = [];
+      } else if (this.form.leixing === "2") {
+        this.eclass = [{}];
+        this.$set(this.form, "musicGroupOrganizationCourseSettingId", "");
       }
     },
-    'form.musicGroupOrganizationCourseSettingId'() {
-      const eclas = this.chargesById[this.form.musicGroupOrganizationCourseSettingId]
-      this.eclass = eclas?.details || []
-      this.syncAllMoney()
-    }
+    "form.musicGroupOrganizationCourseSettingId"(val) {
+      this.getCharges();
+    },
   },
   mounted() {
-    this.getCharges()
+    this.init();
+  },
+  activated() {
+    this.init();
   },
   methods: {
+    init() {
+      console.log(this.rowDetail);
+       this.getCharges();
+      if (this.rowDetail) {
+        this.form.musicGroupOrganizationCourseSettingId = this.rowDetail.musicGroupOrganizationCourseSettingId;
+        this.$set(
+          this.other,
+          "isGiveMusicNetwork",
+          this.rowDetail.isGiveMusicNetwork
+        );
+        this.$set(this.other, "memo", this.rowDetail.memo);
+      }
+    },
     syncAllMoney() {
-      let money = 0
+      let money = 0;
       for (const item of this.eclass) {
-        money += item.courseCurrentPrice
+        money += item.courseCurrentPrice;
       }
-      this.$set(this.cycle, 'paymentAmount', money)
-      return money
+      this.$set(this.cycle, "paymentAmount", money);
+      if(this.rowDetail){
+          this.$set(
+        this.cycle,
+        "paymentPattern",
+        this.rowDetail?.paymentPattern + ""
+      );
+      let arr = [
+        this.rowDetail?.paymentValidStartDate,
+        this.rowDetail?.paymentValidEndDate,
+      ]; 
+      // paymentDate startPaymentDate deadlinePaymentDate
+      this.$set(this.cycle, "paymentDate", [ this.rowDetail?.startPaymentDate, this.rowDetail?.deadlinePaymentDate]);
+      this.$set(this.cycle, "paymentValid", arr);
+      }
+    
+      return money;
     },
     async getChargeTypeList() {
       try {
         const res = await chargeTypeList({
-          row: 9999
-        })
-        this.typeList = res.data.rows
+          row: 9999,
+        });
+        this.typeList = res.data.rows;
       } catch (error) {}
     },
     async getCharges() {
-      const chargeTypeId = this.baseInfo?.musicGroup?.chargeTypeId
+      const chargeTypeId = this.baseInfo?.musicGroup?.chargeTypeId;
       try {
         const res = await musicGroupOrganizationCourseSettingsQueryPage({
           row: 9999,
-          chargeTypeId
-        })
-        this.charges = res.data.rows
+          chargeTypeId,
+        });
+        this.charges = res.data.rows;
+        const eclas = this.chargesById[
+          this.form.musicGroupOrganizationCourseSettingId
+        ];
+        this.eclass = eclas?.details || [];
+
+        this.syncAllMoney();
       } catch (error) {}
     },
     addExtraClass() {
-      this.eclass.push({})
+      this.eclass.push({});
     },
     removeExtraClass(index) {
-      this.eclass[index] = null
-      this.eclass = this.eclass.filter(item => !!item)
+      this.eclass[index] = null;
+      this.eclass = this.eclass.filter((item) => !!item);
     },
     addCycle() {
-      this.cycles.push({})
-      this.collapse.push(this.collapse.length)
+      this.cycles.push({});
+      this.collapse.push(this.collapse.length);
     },
     removeCycle(index) {
-      this.cycles[index] = null
-      this.cycles = this.cycles.filter(item => !!item)
-      this.collapse.pop()
+      this.cycles[index] = null;
+      this.cycles = this.cycles.filter((item) => !!item);
+      this.collapse.pop();
     },
     collapseChange(val) {
-      this.collapse = val
+      this.collapse = val;
     },
     closeNext() {
-      this.nextVisible = false
+      this.nextVisible = false;
     },
     getForms() {
-      const { $refs: refs } = this
+      const { $refs: refs } = this;
       return [refs.base, refs.eclass, refs.cycle, refs.other]
-        .filter(item => !!item)
-        .map(item => item.$refs.form)
+        .filter((item) => !!item)
+        .map((item) => item.$refs.form);
     },
     async submit() {
-      const forms = this.getForms()
-      const valided = []
+      const forms = this.getForms();
+      const valided = [];
       for (const form of forms) {
-        form.validate(valid => {
+        form.validate((valid) => {
           if (valid) {
-            valided.push(form)
+            valided.push(form);
           }
-        })
+        });
       }
       if (valided.length === forms.length) {
-        const { paymentDate, paymentValid, leixing, ...rest } = {...this.form, ...this.other, ...this.cycle, musicGroupPaymentCalenderCourseSettingsList: this.eclass}
+        const { paymentDate, paymentValid, leixing, ...rest } = {
+          ...this.form,
+          ...this.other,
+          ...this.cycle,
+          musicGroupPaymentCalenderCourseSettingsList: this.eclass,
+        };
         const data = {
           ...rest,
-          paymentType: paymentTypeFormat[(this.paymentType == 0 ? this.paymentType : leixing)],
+          paymentType:
+            paymentTypeFormat[
+              this.paymentType == 0 ? this.paymentType : leixing
+            ],
           musicGroupId: this.musicGroupId,
-          ...getTimes(paymentDate, ['startPaymentDate', 'deadlinePaymentDate']),
-          ...getTimes(paymentValid, ['paymentValidStartDate', 'paymentValidEndDate']),
+          ...getTimes(paymentDate, ["startPaymentDate", "deadlinePaymentDate"]),
+          ...getTimes(paymentValid, [
+            "paymentValidStartDate",
+            "paymentValidEndDate",
+          ]),
+        };
+        if (!this.rowDetail?.id) {
+          try {
+            const res = await musicGroupPaymentCalenderAdd(data);
+            this.$listeners.close();
+            this.$listeners.submited(res.data);
+          } catch (error) {}
+        } else {
+           try {
+          data.id = this.rowDetail.id
+          const res = await musicGroupPaymentCalenderDetailBatchUpdate(data);
+          this.$listeners.close();
+          this.$listeners.submited(res.data);
+          } catch (error) {}
         }
-        try {
-          const res = await musicGroupPaymentCalenderAdd(data)
-          this.$listeners.close()
-          this.$listeners.submited(res.data)
-        } catch (error) {}
       }
-    }
+    },
   },
 };
 </script>
 <style lang="less" scoped>
-  .dialog-footer{
-    margin-top: 20px;
-    display: block;
-    text-align: right;
-  }
-  .alert{
-    margin-bottom: 10px;
-  }
-  .collapse-title{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%;
-    .el-icon-circle-close{
-      font-size: 16px;
-      margin-right: 10px;
-    }
-  }
-  /deep/ .el-collapse-item__wrap{
-    padding-top: 20px;
+.dialog-footer {
+  margin-top: 20px;
+  display: block;
+  text-align: right;
+}
+.alert {
+  margin-bottom: 10px;
+}
+.collapse-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .el-icon-circle-close {
+    font-size: 16px;
+    margin-right: 10px;
   }
+}
+/deep/ .el-collapse-item__wrap {
+  padding-top: 20px;
+}
 </style>

+ 7 - 6
src/views/teamBuild/components/teamBaseInfo.vue

@@ -204,7 +204,7 @@
                        :key="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="课酬结算标准"
+        <el-form-item label="课酬结算标准"
                       :rules="[{ required: true, message: '请选择课酬结算标准' }]"
                       prop="salary">
           <el-select v-model.trim="topFrom.salary"
@@ -218,7 +218,7 @@
             <el-option label="课堂课酬"
             value="CLASSROOM_SALARY"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="机构类型"
                       prop="ownershipType">
           <el-select v-model.trim="topFrom.ownershipType"
@@ -751,10 +751,11 @@ export default {
         this.basdisabled = false;
       }
       if (
-        this.teamStatus == "resetTeam" ||
-        this.teamStatus == "teamDraft" ||
-        this.teamStatus == "teamAudit" ||
-        this.teamStatus == "look"
+        // this.teamStatus == "resetTeam" ||
+        // this.teamStatus == "teamDraft" ||
+        // this.teamStatus == "teamAudit" ||
+        // this.teamStatus == "look"
+        this.$route.query.id
       ) {
         // 单团修改
         this.teamid = this.$route.query.id;

+ 2 - 1
src/views/teamBuild/components/teamPayInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pay-container">
-    <resetPayList :isNewGropu="true" />
+    <resetPayList :isNewGropu="true" :baseInfo="baseInfo"/>
     <div class="btnWrap">
       <div class="PrevBtn" @click="goback">上一步</div>
       <!--  v-if="teamStatus != 'teamAudit'" -->
@@ -13,6 +13,7 @@
 // import { payOrderTypeList}  from "@/utils/searchArray";
 import resetPayList from "@/views/resetTeaming/components/resetPayList";
 export default {
+  props:['baseInfo'],
   components: { resetPayList },
   data() {
     return {

+ 6 - 2
src/views/teamBuild/index.vue

@@ -59,13 +59,13 @@
       <!-- 下面显示的内容 -->
       <div class="stepcontent">
         <div v-show="activeIndex == 0">
-          <teamBaseInfo @chiosetab="chiosetab" :getTeamList="getTeamList" />
+          <teamBaseInfo @chiosetab="chiosetab" :getTeamList="getTeamList" @getBaseInfo="getBaseInfo"/>
         </div>
         <div v-if="activeIndex == 1">
           <teamSoundMoney @chiosetab="chiosetab" :getTeamList="getTeamList" />
         </div>
         <div v-if="activeIndex == 2">
-          <teamPayInfo @chiosetab="chiosetab" :getTeamList="getTeamList" />
+          <teamPayInfo @chiosetab="chiosetab" :getTeamList="getTeamList" :baseInfo="baseInfo"/>
         </div>
       </div>
     </div>
@@ -134,6 +134,10 @@ export default {
         query: { search: this.Fsearch, rules: this.Frules },
       });
     },
+     getBaseInfo(baseInfo) {
+      this.baseInfo = baseInfo
+      this.pageName = baseInfo.musicGroup?.name
+    },
   },
 };
 </script>