mo 4 gadi atpakaļ
vecāks
revīzija
836470928c

+ 246 - 298
src/views/resetTeaming/components/resetPayList.vue

@@ -1,39 +1,33 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <el-form :inline="true" :model="searchForm">
+    <el-form :inline="true"
+             :model="searchForm">
       <el-form-item>
-        <el-select
-          placeholder="缴费类型"
-          v-model="searchForm.paymentType"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="(item, index) in payOrderTypeList"
-            :label="item.label"
-            :value="item.value"
-            :key="index"
-          ></el-option>
+        <el-select placeholder="缴费类型"
+                   v-model="searchForm.paymentType"
+                   clearable
+                   filterable>
+          <el-option v-for="(item, index) in payOrderTypeList"
+                     :label="item.label"
+                     :value="item.value"
+                     :key="index"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item>
-        <el-button type="danger" @click="getList">搜索</el-button>
+        <el-button type="danger"
+                   @click="getList">搜索</el-button>
         <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
       </el-form-item>
     </el-form>
     <div class="topWrap">
-      <!-- <div class="newBand"
-           @click="newPay"
-           v-permission="'musicGroupPaymentCalender/add'">新建缴费</div> -->
       <div class="newBand"
            @click="newUserPay"
+           v-if="teamStatus"
            v-permission="'musicGroupPaymentCalender/add'">新建学员缴费</div>
-      <!-- <div class="newBand"
-           @click="newSchoolPay"
-           v-permission="'musicGroupPaymentCalender/add'">新建学校缴费</div> -->
       <div class="newBand"
+           v-if="teamStatus"
            v-permission="'/studentPayBase'"
            @click="setStudentPay">学员缴费设置</div>
       <!-- <div class="newBand"
@@ -41,97 +35,65 @@
            @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="batchNo"
-          width="120"
-          label="订单编号"
-        ></el-table-column>
-        <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="batchNo"
+                         width="200"
+                         label="订单编号"></el-table-column>
+        <el-table-column align="center"
+                         prop="startPaymentDate"
+                         width="200"
+                         label="缴费日期">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.startPaymentDate | formatTimer }}
+              {{ scope.row.startPaymentDate | formatTimer }} ~ {{ scope.row.deadlinePaymentDate | formatTimer }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          width="120"
-          prop="deadlinePaymentDate"
-          label="缴费结束日期"
-        >
+        <el-table-column align="center"
+                         prop="expectNum"
+                         width="200"
+                         label="缴费人数(预计/实际)">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.deadlinePaymentDate | formatTimer }}
+              {{scope.row.expectNum}}/{{scope.row.actualNum}}
             </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="paymentPattern"
+                         label="缴费方式">
           <template slot-scope="scope">
             <div>
               {{ scope.row.paymentPattern | teamPayStatus }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="paymentValidStartDate"
-          width="150"
-          label="缴费有效期开始日期"
-        >
-          <template slot-scope="scope">
-            <div>
-              {{ 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="paymentValidStartDate"
+                         width="200"
+                         label="缴费有效期">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentValidEndDate | formatTimer }}
+              {{ scope.row.paymentValidStartDate | 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="status"
+                         label="缴费状态">
           <template slot-scope="scope">
             <div>
               {{ 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 ? "是" : "否" }}
@@ -141,7 +103,9 @@
         <el-table-column align="center"
                          prop="memo"
                          label="备注"></el-table-column>
-        <el-table-column label="操作" fixed="right" min-width="260px">
+        <el-table-column label="操作"
+                         fixed="right"
+                         min-width="260px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -149,206 +113,176 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
-                         v-if="scope.row.status == 'REJECT'"
+                         v-if="scope.row.status == 'REJECT'&&teamStatus"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
-              <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button>
-              <el-button type="text" v-if="isNewGropu" v-permission="'musicGroup/findMusicGroupSubjectInfo/966'" @click="onPreview(scope.row)">预览</el-button>
+              <el-button type="text"
+                         v-if="!isNewGropu&&teamStatus"
+                         @click="onCreateQRCode(scope.row)">续费二维码</el-button>
+              <el-button type="text"
+                         v-if="isNewGropu&&teamStatus"
+                         v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
+                         @click="onPreview(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="[
+    <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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
-      title="查看"
-      :visible.sync="reviewVisible"
-      width="900px"
-      destroy-on-close
-    >
-      <reviewDetail
-        @close="reviewVisible = false"
-        @submited="getList"
-        :detail="viewDetail"
-        :musicGroupId="$route.query.id"
-        destroy-on-close
-      />
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="reviewVisible = false"
-          >关闭</el-button
-        >
+    <el-dialog title="查看"
+               :visible.sync="reviewVisible"
+               width="900px"
+               destroy-on-close>
+      <reviewDetail @close="reviewVisible = false"
+                    @submited="getList"
+                    :detail="viewDetail"
+                    :musicGroupId="$route.query.id"
+                    destroy-on-close />
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary"
+                   @click="reviewVisible = false">关闭</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      :title="payFormTitle"
-      :visible.sync="userVisible"
-      width="830px"
-
-    >
-      <userPayForm
-        v-if="userVisible"
-        @close="userVisible = false"
-        @submited="payedSubmited"
-        @changeActive="$listeners.changeActive"
-        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
-        :rowDetail='activeRow'
-        :type="payFormType"
-        :baseInfo="baseInfo"
-        :paymentType="isNewGropu ? 0 : undefined"
-        :musicGroupId="$route.query.id"
-      />
+    <el-dialog :title="payFormTitle"
+               :visible.sync="userVisible"
+               width="830px">
+      <userPayForm v-if="userVisible"
+                   @close="userVisible = false"
+                   @submited="payedSubmited"
+                   @changeActive="$listeners.changeActive"
+                   :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
+                   :rowDetail='activeRow'
+                   :type="payFormType"
+                   :baseInfo="baseInfo"
+                   :paymentType="isNewGropu ? 0 : undefined"
+                   :musicGroupId="$route.query.id" />
     </el-dialog>
 
     <el-dialog title="学员选择"
@@ -365,34 +299,44 @@
       <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" />
+    <qr-code v-model="qrcodeStatus"
+             title="续费二维码"
+             :codeUrl="codeUrl" />
 
-    <el-dialog
-      title="选择预览声部"
-      :visible.sync="dialogSubjectVisible"
-      width="400px">
+    <el-dialog title="选择预览声部"
+               :visible.sync="dialogSubjectVisible"
+               width="400px">
       <el-radio-group v-model="dialogSubjectId">
-        <el-radio style="margin-right: 15px;" border size="medium" :label="item.subjectId" v-for="(item, index) in dialogSubjectList" :key="index">{{ item.subName }}</el-radio>
+        <el-radio style="margin-right: 15px;"
+                  border
+                  size="medium"
+                  :label="item.subjectId"
+                  v-for="(item, index) in dialogSubjectList"
+                  :key="index">{{ item.subName }}</el-radio>
       </el-radio-group>
       <div slot="footer">
         <el-button @click="dialogSubjectVisible = false">取 消</el-button>
-        <el-button type="primary" v-permission="'studentRegistration/getSubjectGoodsAndInfo/967'" @click="onPreviewSubmit">预 览</el-button>
+        <el-button type="primary"
+                   v-permission="'studentRegistration/getSubjectGoodsAndInfo/967'"
+                   @click="onPreviewSubmit">预 览</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog
-      title="预览"
-      :visible.sync="previewVisible"
-      v-if="previewVisible"
-      class="previewContainer"
-      width="400px">
-      <subject-preview :subjectId="dialogSubjectId" :calenderId="dialogCalenderId"></subject-preview>
+    <el-dialog title="预览"
+               :visible.sync="previewVisible"
+               v-if="previewVisible"
+               class="previewContainer"
+               width="400px">
+      <subject-preview :subjectId="dialogSubjectId"
+                       :calenderId="dialogCalenderId"></subject-preview>
       <div slot="footer">
-        <el-button type="primary" @click="previewVisible = false">确 定</el-button>
+        <el-button type="primary"
+                   @click="previewVisible = false">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -419,7 +363,7 @@ import reviewDetail from '../modals/review-detail'
 import subjectPreview from '@/views/resetTeaming/modals/subject-preview'
 import { userPaymentType } from '@/constant'
 import { objectToOptions } from '@/utils'
-import { payOrderTypeList}  from "@/utils/searchArray";
+import { payOrderTypeList } from "@/utils/searchArray";
 export default {
   props: ["baseInfo", "isNewGropu"],
   components: {
@@ -432,7 +376,7 @@ export default {
     reviewDetail,
     subjectPreview
   },
-  data() {
+  data () {
     return {
       musicGroupStu: [],
       payFormType: "user",
@@ -468,7 +412,7 @@ export default {
       activeRow: null,
       pickerOptions: {
         firstDayOfWeek: 1,
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         },
       },
@@ -487,50 +431,54 @@ export default {
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
+  created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  async mounted() {
+  async mounted () {
     // 获取分部
     try {
       const res = await getOrganizationCourseUnitPriceSettings({
         rows: 9999
       })
       this.organizationCourseUnitPriceSettings = res.data.rows
-    } catch (error) {}
+    } catch (error) { }
     this.init();
   },
   computed: {
-    payOrderTypeList() {
+    payOrderTypeList () {
       return objectToOptions(userPaymentType);
     },
-    payFormTitle() {
+    payFormTitle () {
       if (this.isNew) {
         return this.payFormType === "user" ? "新增学员缴费" : "新增学校缴费";
       } else {
         return this.payFormType === "user" ? "修改学员缴费" : "修改学校缴费";
       }
     },
+    teamStatus () {
+      let type = this.$route.query.type;
+      return type == 'teamDraft' || type == 'resetTeam'
+    }
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    async init() {
+    async init () {
       try {
         const res = await getMusicGroupStu({
           musicGroupId: this.$route.query.id,
         });
 
-      } catch (error) {}
+      } catch (error) { }
       this.getList();
     },
-    newUserPay() {
+    newUserPay () {
       this.payFormType = "user";
       this.isNew = true;
       this.activeRow = null
       this.userVisible = true;
     },
-    newSchoolPay() {
+    newSchoolPay () {
       this.payFormType = "school";
       this.isNew = true;
       this.activeRow = null
@@ -551,7 +499,7 @@ export default {
         }
       });
     },
-    paymentPatternChange(val) {
+    paymentPatternChange (val) {
       if (val === 2) {
         this.payForm.paymentValidEndDate = null;
       }
@@ -560,22 +508,22 @@ export default {
       this.qrcodeStatus = true
       this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id
     },
-    chioseStudent(val) {
+    chioseStudent (val) {
       this.chioseStudentList = val;
     },
-    newPay() {
+    newPay () {
       this.diTitle = "新增缴费";
       this.isNew = true;
       this.payVisible = true;
     },
-    resetPay(row) {
+    resetPay (row) {
       this.diTitle = "修改缴费";
       this.isNew = false;
       this.activeRow = row;
-      this.payFormType = row.payUserType==='SCHOOL'?'school':'user'
+      this.payFormType = row.payUserType === 'SCHOOL' ? 'school' : 'user'
       this.userVisible = true;
     },
-    async chioseStudentSubmited() {
+    async chioseStudentSubmited () {
       try {
         await this.$confirm('缴费创建完成, 是否立即排课?', '提示', {
           confirmButtonText: '确定',
@@ -587,9 +535,9 @@ export default {
             name: '5'
           })
         }
-      } catch (error) {}
+      } catch (error) { }
     },
-    detelePay(row) {
+    detelePay (row) {
       let id = row.id;
       this.$confirm(`确定删除该缴费周期?`, "提示", {
         confirmButtonText: "确定",
@@ -604,9 +552,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    lookDetail(row) {
+    lookDetail (row) {
       let query = this.$route.query;
       this.$route.query.paymentId = row.id;
       this.viewDetail = row;
@@ -616,11 +564,11 @@ export default {
         this.$router.push({ path: "/business/strudentPayInfo", query });
       }
     },
-    setStudentPay() {
+    setStudentPay () {
       let query = this.$route.query;
       this.$router.push({ path: "/business/studentPayBase", query });
     },
-    newPayInfo() {
+    newPayInfo () {
       this.$refs["payForm"].validate((res) => {
         if (res) {
           /**
@@ -637,7 +585,7 @@ export default {
         }
       });
     },
-    submitNewPay() {
+    submitNewPay () {
       if (this.chioseStudentList.length < 1) {
         this.$message.error("请至少选择一名学员");
         return;
@@ -658,7 +606,7 @@ export default {
         }
       });
     },
-    resetPayDate() {
+    resetPayDate () {
       resetMusicGroupPaymentCalender({
         id: this.activeRow.id,
         startPaymentDate: this.payForm.startPaymentDate,
@@ -678,13 +626,13 @@ export default {
         }
       });
     },
-    changeStartTime(val) {
+    changeStartTime (val) {
       this.payForm.deadlinePaymentDate = this.dateAddDays(val, 3);
     },
-    changePaymentStartTime(val) {
+    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天
@@ -696,10 +644,10 @@ export default {
         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();
           } else {
@@ -709,18 +657,18 @@ export default {
         },
       };
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = { payUserType: null };
     },
     openChioseStudent (row) {
       this.chioseStudentVisible = true;
       this.musicGroupPaymentCalenderId = row.id;
     },
-    async payedSubmited(data) {
+    async payedSubmited (data) {
       try {
         await this.getList();
         // if (!this.isNewGropu) {
@@ -729,13 +677,13 @@ export default {
         //     this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
         //   }
         // }
-      } catch (error) {}
+      } catch (error) { }
     },
-    async onPreview(row) { // 开始预览
+    async onPreview (row) { // 开始预览
       this.dialogCalenderId = row.id
       const musicGroupId = this.$route.query.id
       await findMusicGroupSubjectInfo({ musicGroupId: musicGroupId }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.dialogSubjectList = res.data.musicGroupSubjectPlans
           this.dialogSubjectVisible = true
         } else {
@@ -743,12 +691,12 @@ export default {
         }
       })
     },
-    onPreviewSubmit() {
+    onPreviewSubmit () {
       this.previewVisible = true
     }
   },
   watch: {
-    chioseStudentVisible() {
+    chioseStudentVisible () {
       this.chioseStudentList = [];
     },
     payVisible (val) {

+ 211 - 261
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -1,113 +1,89 @@
 <!--  -->
 <template>
   <div class="m-core">
-    <el-form :inline="true" :model="searchForm">
+    <el-form :inline="true"
+             :model="searchForm">
       <el-form-item>
-        <el-select
-          placeholder="缴费类型"
-          v-model="searchForm.paymentType"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="(item, index) in payOrderTypeList"
-            :label="item.label"
-            :value="item.value"
-            :key="index"
-          ></el-option>
+        <el-select placeholder="缴费类型"
+                   v-model="searchForm.paymentType"
+                   clearable
+                   filterable>
+          <el-option v-for="(item, index) in payOrderTypeList"
+                     :label="item.label"
+                     :value="item.value"
+                     :key="index"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item>
-        <el-button type="danger" @click="getList">搜索</el-button>
+        <el-button type="danger"
+                   @click="getList">搜索</el-button>
         <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
       </el-form-item>
     </el-form>
     <div class="topWrap">
-      <!-- <div class="newBand"
-           @click="newPay"
-           v-permission="'musicGroupPaymentCalender/add'">新建缴费</div> -->
-      <!-- <div class="newBand"
-           @click="newUserPay"
-           v-permission="'musicGroupPaymentCalender/add'">新建学员缴费</div> -->
       <div class="newBand"
            @click="newSchoolPay"
+           v-if="teamStatus"
            v-permission="'musicGroupPaymentCalender/add'">新建学校缴费</div>
       <div class="newBand"
            v-permission="'/studentPayBase'"
+           v-if="teamStatus"
            @click="setStudentPay">学员缴费设置</div>
       <!-- <div class="newBand"
       v-if="!isNewGropu"
            @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="batchNo"
-          width="120"
-          label="订单编号"
-        ></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 style="width: 100%"
+                :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+                :data="tableList">
+        <el-table-column align="center"
+                         prop="batchNo"
+                         width="200"
+                         label="订单编号"></el-table-column>
+        <el-table-column align="center"
+                         prop="expectNum"
+                         width="200"
+                         label="缴费人数(预计/实际)">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentPattern | teamPayStatus }}
+              {{scope.row.expectNum}}/{{scope.row.actualNum}}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="paymentValidStartDate"
-          width="150"
-          label="缴费有效期开始日期"
-        >
+        <el-table-column align="center"
+                         prop="paymentPattern"
+                         label="缴费方式">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentValidStartDate | formatTimer }}
+              {{ scope.row.paymentPattern | teamPayStatus }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="paymentValidEndDate"
-          width="150"
-          label="缴费有效期结束日期"
-        >
+        <el-table-column align="center"
+                         prop="paymentValidStartDate"
+                         width="200"
+                         label="缴费有效期">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentValidEndDate | formatTimer }}
+              {{ scope.row.paymentValidStartDate | 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="status"
+                         label="缴费状态">
           <template slot-scope="scope">
             <div>
               {{ 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 ? "是" : "否" }}
@@ -117,7 +93,9 @@
         <el-table-column align="center"
                          prop="memo"
                          label="备注"></el-table-column>
-        <el-table-column label="操作" fixed="right" min-width="260px">
+        <el-table-column label="操作"
+                         fixed="right"
+                         min-width="260px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -125,10 +103,10 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
-                         v-if="scope.row.status == 'REJECT'"
+                         v-if="scope.row.status == 'REJECT'&&teamStatus"
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
@@ -137,193 +115,158 @@
           </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="[
+    <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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="[
+        <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>
+                      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
-      title="查看"
-      :visible.sync="reviewVisible"
-      width="900px"
-      destroy-on-close
-    >
-      <reviewDetail
-        @close="reviewVisible = false"
-        @submited="getList"
-        :detail="viewDetail"
-        :musicGroupId="$route.query.id"
-        destroy-on-close
-      />
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="reviewVisible = false"
-          >关闭</el-button
-        >
+    <el-dialog title="查看"
+               :visible.sync="reviewVisible"
+               width="900px"
+               destroy-on-close>
+      <reviewDetail @close="reviewVisible = false"
+                    @submited="getList"
+                    :detail="viewDetail"
+                    :musicGroupId="$route.query.id"
+                    destroy-on-close />
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary"
+                   @click="reviewVisible = false">关闭</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      :title="payFormTitle"
-      :visible.sync="userVisible"
-      width="830px"
-
-    >
-      <userPayForm
-        v-if="userVisible"
-        @close="userVisible = false"
-        @submited="payedSubmited"
-        @changeActive="$listeners.changeActive"
-        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
-        :rowDetail='activeRow'
-        :type="payFormType"
-        :baseInfo="baseInfo"
-        :paymentType="isNewGropu ? 0 : undefined"
-        :musicGroupId="$route.query.id"
-      />
+    <el-dialog :title="payFormTitle"
+               :visible.sync="userVisible"
+               width="830px">
+      <userPayForm v-if="userVisible"
+                   @close="userVisible = false"
+                   @submited="payedSubmited"
+                   @changeActive="$listeners.changeActive"
+                   :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
+                   :rowDetail='activeRow'
+                   :type="payFormType"
+                   :baseInfo="baseInfo"
+                   :paymentType="isNewGropu ? 0 : undefined"
+                   :musicGroupId="$route.query.id" />
     </el-dialog>
 
     <el-dialog title="学员选择"
@@ -339,11 +282,14 @@
       <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" />
+    <qr-code v-model="qrcodeStatus"
+             title="续费二维码"
+             :codeUrl="codeUrl" />
   </div>
 </template>
 <script>
@@ -367,7 +313,7 @@ import review from '../modals/review'
 import reviewDetail from '../modals/review-detail'
 import { userPaymentType } from '@/constant'
 import { objectToOptions } from '@/utils'
-import { payOrderTypeList}  from "@/utils/searchArray";
+import { payOrderTypeList } from "@/utils/searchArray";
 export default {
   props: ["baseInfo", "isNewGropu"],
   components: {
@@ -379,7 +325,7 @@ export default {
     review,
     reviewDetail,
   },
-  data() {
+  data () {
     return {
       musicGroupStu: [],
       payFormType: "user",
@@ -415,7 +361,7 @@ export default {
       activeRow: null,
       pickerOptions: {
         firstDayOfWeek: 1,
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         },
       },
@@ -429,50 +375,54 @@ export default {
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
+  created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  async mounted() {
+  async mounted () {
     // 获取分部
     try {
       const res = await getOrganizationCourseUnitPriceSettings({
         rows: 9999
       })
       this.organizationCourseUnitPriceSettings = res.data.rows
-    } catch (error) {}
+    } catch (error) { }
     this.init();
   },
   computed: {
-    payOrderTypeList() {
+    payOrderTypeList () {
       return objectToOptions(userPaymentType);
     },
-    payFormTitle() {
+    payFormTitle () {
       if (this.isNew) {
         return this.payFormType === "user" ? "新增学员缴费" : "新增学校缴费";
       } else {
         return this.payFormType === "user" ? "修改学员缴费" : "修改学校缴费";
       }
     },
+    teamStatus () {
+      let type = this.$route.query.type;
+      return type == 'teamDraft' || type == 'resetTeam'
+    }
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    async init() {
+    async init () {
       try {
         const res = await getMusicGroupStu({
           musicGroupId: this.$route.query.id,
         });
 
-      } catch (error) {}
+      } catch (error) { }
       this.getList();
     },
-    newUserPay() {
+    newUserPay () {
       this.payFormType = "user";
       this.isNew = true;
       this.activeRow = null
       this.userVisible = true;
     },
-    newSchoolPay() {
+    newSchoolPay () {
       this.payFormType = "school";
       this.isNew = true;
       this.activeRow = null
@@ -493,7 +443,7 @@ export default {
         }
       });
     },
-    paymentPatternChange(val) {
+    paymentPatternChange (val) {
       if (val === 2) {
         this.payForm.paymentValidEndDate = null;
       }
@@ -502,22 +452,22 @@ export default {
       this.qrcodeStatus = true
       this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id
     },
-    chioseStudent(val) {
+    chioseStudent (val) {
       this.chioseStudentList = val;
     },
-    newPay() {
+    newPay () {
       this.diTitle = "新增缴费";
       this.isNew = true;
       this.payVisible = true;
     },
-    resetPay(row) {
+    resetPay (row) {
       this.diTitle = "修改缴费";
       this.isNew = false;
       this.activeRow = row;
-      this.payFormType = row.payUserType==='SCHOOL'?'school':'user'
+      this.payFormType = row.payUserType === 'SCHOOL' ? 'school' : 'user'
       this.userVisible = true;
     },
-    async chioseStudentSubmited() {
+    async chioseStudentSubmited () {
       try {
         await this.$confirm('缴费创建完成, 是否立即排课?', '提示', {
           confirmButtonText: '确定',
@@ -529,9 +479,9 @@ export default {
             name: '5'
           })
         }
-      } catch (error) {}
+      } catch (error) { }
     },
-    detelePay(row) {
+    detelePay (row) {
       let id = row.id;
       this.$confirm(`确定删除该缴费周期?`, "提示", {
         confirmButtonText: "确定",
@@ -546,9 +496,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    lookDetail(row) {
+    lookDetail (row) {
       let query = this.$route.query;
       this.$route.query.paymentId = row.id;
       this.viewDetail = row;
@@ -558,11 +508,11 @@ export default {
         this.$router.push({ path: "/business/strudentPayInfo", query });
       }
     },
-    setStudentPay() {
+    setStudentPay () {
       let query = this.$route.query;
       this.$router.push({ path: "/business/studentPayBase", query });
     },
-    newPayInfo() {
+    newPayInfo () {
       this.$refs["payForm"].validate((res) => {
         if (res) {
           /**
@@ -579,7 +529,7 @@ export default {
         }
       });
     },
-    submitNewPay() {
+    submitNewPay () {
       if (this.chioseStudentList.length < 1) {
         this.$message.error("请至少选择一名学员");
         return;
@@ -600,7 +550,7 @@ export default {
         }
       });
     },
-    resetPayDate() {
+    resetPayDate () {
       resetMusicGroupPaymentCalender({
         id: this.activeRow.id,
         startPaymentDate: this.payForm.startPaymentDate,
@@ -620,13 +570,13 @@ export default {
         }
       });
     },
-    changeStartTime(val) {
+    changeStartTime (val) {
       this.payForm.deadlinePaymentDate = this.dateAddDays(val, 3);
     },
-    changePaymentStartTime(val) {
+    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天
@@ -638,10 +588,10 @@ export default {
         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();
           } else {
@@ -651,18 +601,18 @@ export default {
         },
       };
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = { payUserType: null };
     },
     openChioseStudent (row) {
       this.chioseStudentVisible = true;
       this.musicGroupPaymentCalenderId = row.id;
     },
-    async payedSubmited(data) {
+    async payedSubmited (data) {
       try {
         await this.getList();
         // if (!this.isNewGropu) {
@@ -671,11 +621,11 @@ export default {
         //     this.musicGroupPaymentCalenderId = data.musicGroupPaymentCalenderId;
         //   }
         // }
-      } catch (error) {}
+      } catch (error) { }
     },
   },
   watch: {
-    chioseStudentVisible() {
+    chioseStudentVisible () {
       this.chioseStudentList = [];
     },
     payVisible (val) {

+ 178 - 218
src/views/resetTeaming/components/strudentPayInfo.vue

@@ -1,7 +1,8 @@
 <!--  -->
 <template>
   <div class="m-container">
-    <el-page-header @back="goBack" content="学员缴费记录"> </el-page-header>
+    <el-page-header @back="goBack"
+                    content="学员缴费记录"> </el-page-header>
     <!--    this.info = {
             paymentStatus: res.data.calender.paymentStatus,
             startPaymentDate: res.data.calender.startPaymentDate,
@@ -14,25 +15,19 @@
       <div class="left">
         <p class="title">状态</p>
 
-        <p
-          class="status"
-          style="color: #ff6a6a"
-          v-if="info.paymentStatus == 'OPEN'"
-        >
+        <p class="status"
+           style="color: #ff6a6a"
+           v-if="info.paymentStatus == 'OPEN'">
           {{ "已开启" }}
         </p>
-        <p
-          class="status"
-          style="color: #ff6a6a"
-          v-if="info.paymentStatus == 'NO'"
-        >
+        <p class="status"
+           style="color: #ff6a6a"
+           v-if="info.paymentStatus == 'NO'">
           {{ "未开始" }}
         </p>
-        <p
-          class="status"
-          style="color: #5ccdb8"
-          v-if="info.paymentStatus == 'OVER'"
-        >
+        <p class="status"
+           style="color: #5ccdb8"
+           v-if="info.paymentStatus == 'OVER'">
           {{ "已结束" }}
         </p>
       </div>
@@ -61,87 +56,62 @@
         </div>
       </div>
     </div>
-    <el-form
-      ref="titleForm"
-      :model="titleForm"
-      :inline="true"
-      label-width="80px"
-    >
-      <el-form-item label="缴费类型">
-        <div class="inputStyle">{{ titleForm.paymentType| auditPaymentType}}</div>
-      </el-form-item>
-      <el-form-item label="收费标准">
-        <div class="inputStyle">{{ titleForm.musicGroupOrganizationCourseSettingId }}</div>
-      </el-form-item>
-      <el-form-item label="缴费方式">
-        <div class="inputStyle">{{ titleForm.paymentPattern }}</div>
-      </el-form-item>
-      <el-form-item label="缴费周期">
-        <div class="inputStyle">
-          {{ titleForm.paymentValidStartDate|formatTimer }}~{{
-            titleForm.paymentValidEndDate|formatTimer
-          }}
-        </div>
-      </el-form-item>
-      <el-form-item label="收费内容">
-        <div class="inputStyle" style="width:500px">{{ infoMsg }}</div>
-      </el-form-item>
-    </el-form>
+
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="学员编号,手机号"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="学员编号,手机号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.subjectId"
-            style="width: 180px"
-            clearable
-            filterable
-            placeholder="请选择声部"
-          >
-            <el-option
-              v-for="(item, index) in soundList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select v-model.trim="searchForm.subjectId"
+                     style="width: 180px"
+                     clearable
+                     filterable
+                     placeholder="请选择声部">
+            <el-option v-for="(item, index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.paymentStatus"
-            style="width: 180px"
-            clearable
-            filterable
-            placeholder="请选择状态"
-          >
-            <el-option label="未缴费" value="NON_PAYMENT"></el-option>
-            <el-option label="缴费中" value="PROCESSING"></el-option>
-            <el-option label="已缴费" value="PAID_COMPLETED"></el-option>
+          <el-select v-model.trim="searchForm.paymentStatus"
+                     style="width: 180px"
+                     clearable
+                     filterable
+                     placeholder="请选择状态">
+            <el-option label="未缴费"
+                       value="NON_PAYMENT"></el-option>
+            <el-option label="缴费中"
+                       value="PROCESSING"></el-option>
+            <el-option label="已缴费"
+                       value="PAID_COMPLETED"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.musicGroupStatus"
-            style="width: 180px"
-            clearable
-            filterable
-            placeholder="请选择学员状态"
-          >
-            <el-option label="在读" value="NORMAL"></el-option>
-            <el-option label="退团" value="QUIT"></el-option>
-            <el-option label="休学" value="QUIT_SCHOOL"></el-option>
-            <el-option label="报名" value="APPLY"></el-option>
+          <el-select v-model.trim="searchForm.musicGroupStatus"
+                     style="width: 180px"
+                     clearable
+                     filterable
+                     placeholder="请选择学员状态">
+            <el-option label="在读"
+                       value="NORMAL"></el-option>
+            <el-option label="退团"
+                       value="QUIT"></el-option>
+            <el-option label="休学"
+                       value="QUIT_SCHOOL"></el-option>
+            <el-option label="报名"
+                       value="APPLY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!--   NO: '未开启缴费',
@@ -149,12 +119,15 @@
   OVER: '缴费已结束', -->
       <div class="wrap">
         <div class="newBand"
+             @click="detailVisible=true">缴费详情</div>
+        <div class="newBand"
              @click="resetPay"
              v-permission="'musicGroupPaymentCalenderDetail/updateExpectAmount'">修改缴费金额</div>
         <div class="newBand"
              @click="startPay"
              v-if="info.paymentStatus != 'OPEN'"
              v-permission="'musicGroupPaymentCalenderDetail/openPayment'">开启缴费</div>
+
         <!-- <div
           class="newBand"
           @click="addStudentBtn"
@@ -171,48 +144,44 @@
         >
           删除学员
         </div> -->
-        <div
-          class="newBand"
-          v-permission="'export/musicGroupPaymentCalenderDetail'"
-          @click="onMusicGroupPaymentCalenderDetail"
-        >
+        <div class="newBand"
+             v-permission="'export/musicGroupPaymentCalenderDetail'"
+             @click="onMusicGroupPaymentCalenderDetail">
           缴费记录导出
         </div>
       </div>
 
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-          :data="tableList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            :selectable="checkSelect"
-            width="55"
-          >
+        <el-table style="width: 100%"
+                  :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+                  :data="tableList"
+                  @selection-change="handleSelectionChange">
+          <el-table-column type="selection"
+                           :selectable="checkSelect"
+                           width="55">
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="userId"
-            label="学员编号"
-          ></el-table-column>
-          <el-table-column align="center" prop="studentId" label="学员姓名">
+          <el-table-column align="center"
+                           prop="userId"
+                           label="学员编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="学员姓名">
             <template slot-scope="scope">
               <div v-if="scope.row.sysUser">
                 {{ scope.row.sysUser.username }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="学员声部">
+          <el-table-column align="center"
+                           label="学员声部">
             <template slot-scope="scope">
               <div v-if="scope.row.studentRegistration">
                 {{ scope.row.studentRegistration.subjectName }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="学员状态">
+          <el-table-column align="center"
+                           label="学员状态">
             <template slot-scope="scope">
               <div v-if="scope.row.studentRegistration">
                 {{
@@ -222,26 +191,28 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="手机号">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="手机号">
             <template slot-scope="scope">
               <div v-if="scope.row.sysUser">
                 {{ scope.row.sysUser.phone }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="expectAmount"
-            label="预计缴费金额"
-          ></el-table-column>
-          <el-table-column align="center" label="缴费开始日期">
+          <el-table-column align="center"
+                           prop="expectAmount"
+                           label="预计缴费金额"></el-table-column>
+          <el-table-column align="center"
+                           label="缴费开始日期">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.startPaymentDateMgpc | formatTimer }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="缴费截止日期">
+          <el-table-column align="center"
+                           label="缴费截止日期">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.deadlinePaymentDateMgpc | formatTimer }}
@@ -256,14 +227,17 @@
               </div>
             </template>
           </el-table-column> -->
-          <el-table-column align="center" label="缴费状态">
+          <el-table-column align="center"
+                           label="缴费状态">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.paymentStatus | paymentStatusDetall }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="支付时间">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="支付时间">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.payTime | dateForMinFormat }}
@@ -276,22 +250,20 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
-                           :disabled="checkSelect"
+                           :disabled="checkSelect(scope.row)"
                            @click="resetPay(scope.row)">修改金额</el-button>
                 <el-button type="text"
-                           :disabled="checkSelect"
+                           :disabled="checkSelect(scope.row)"
                            @click="startPay(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>
     </div>
     <!-- <el-dialog :visible.sync="payVisible"
@@ -317,27 +289,22 @@
       </div>
     </el-dialog> -->
 
-    <el-dialog
-      :visible.sync="resetPayVisible"
-      width="500px"
-      title="修改缴费金额"
-    >
-      <el-form
-        :model="resetPayForm"
-        :inline="true"
-        label-width="120px"
-        label-position="right"
-        ref="resetPayForm"
-      >
+    <el-dialog :visible.sync="resetPayVisible"
+               width="500px"
+               title="修改缴费金额">
+      <el-form :model="resetPayForm"
+               :inline="true"
+               label-width="120px"
+               label-position="right"
+               ref="resetPayForm">
         <!-- <el-form-item label="学员姓名"
                       :rules="[{ required: true, message: '学员姓名',trigger: 'blur'}]"
                       prop="startDate">
           <el-input disabled
                     value="张三"></el-input>
         </el-form-item> -->
-        <el-form-item
-          label="预计缴费金额"
-          :rules="[
+        <el-form-item label="预计缴费金额"
+                      :rules="[
             { required: true, message: '请输入预计缴费金额', trigger: 'blur' },
             {
               pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -345,49 +312,51 @@
               trigger: 'blur',
             },
           ]"
-          prop="momey"
-        >
+                      prop="momey">
           <el-input v-model="resetPayForm.momey"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="resetPayVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitReset">确 定</el-button>
+        <el-button type="primary"
+                   @click="submitReset">确 定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="studentVisible" width="600">
-      <el-table
-        :data="studentList"
-        class="studenTable"
-        ref="singleTable"
-        highlight-current-row
-        @current-change="handleCurrentChange"
-      >
+    <el-dialog :visible.sync="studentVisible"
+               width="600">
+      <el-table :data="studentList"
+                class="studenTable"
+                ref="singleTable"
+                highlight-current-row
+                @current-change="handleCurrentChange">
         <!-- <el-table-column type="selection"
                          width="55">
         </el-table-column> -->
-        <el-table-column
-          property="userId"
-          align="center"
-          label="学员编号"
-        ></el-table-column>
-        <el-table-column
-          property="name"
-          align="center"
-          label="学员姓名"
-        ></el-table-column>
-        <el-table-column
-          property="phone"
-          align="center"
-          label="手机号"
-        ></el-table-column>
+        <el-table-column property="userId"
+                         align="center"
+                         label="学员编号"></el-table-column>
+        <el-table-column property="name"
+                         align="center"
+                         label="学员姓名"></el-table-column>
+        <el-table-column property="phone"
+                         align="center"
+                         label="手机号"></el-table-column>
       </el-table>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="cancleAdd">取 消</el-button>
-        <el-button type="primary" @click="submitAddStudent">确 定</el-button>
+        <el-button type="primary"
+                   @click="submitAddStudent">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog width="500px"
+               title="查看缴费详情"
+               :visible.sync="detailVisible">
+      <studentPayDetail :msgList='msgList'
+                        :titleForm='titleForm' />
+    </el-dialog>
   </div>
 </template>
 
@@ -398,8 +367,9 @@ import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import cleanDeep from "clean-deep";
 import qs from "qs";
-import {courseType} from '@/utils/searchArray'
+import { courseType } from '@/utils/searchArray'
 import { paymentPatternType } from '@/constant'
+import studentPayDetail from '../modals/studentPayDetail'
 import {
   findSound,
   getmusicGroupPaymentCalenderDetail,
@@ -412,8 +382,8 @@ import {
 } from "@/api/buildTeam";
 
 export default {
-  components: { pagination },
-  data() {
+  components: { pagination, studentPayDetail },
+  data () {
     return {
       searchForm: {
         search: null,
@@ -437,7 +407,7 @@ export default {
       chioseStudent: null,
       studentList: [],
       pickerOptions: {
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         },
       },
@@ -458,6 +428,9 @@ export default {
         actualNum: null,
         sumActualAmount: null,
       },
+
+      msgList: [],
+      detailVisible: false,
       titleForm: {
         paymentType: "",
         musicGroupOrganizationCourseSettingId: "",
@@ -466,13 +439,12 @@ export default {
         paymentValidEndDate: "",
         calenderSettingsName: "",
       },
-      msgList:[]
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
+  created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
+  mounted () {
     // 获取声部
     this.teamid = this.$route.query.id;
     findSound({ musicGroupId: this.teamid }).then((res) => {
@@ -483,7 +455,7 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
+  activated () {
     this.teamid = this.$route.query.id;
     findSound({ musicGroupId: this.teamid }).then((res) => {
       if (res.code == 200) {
@@ -493,10 +465,10 @@ export default {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.getList();
     },
-    getList() {
+    getList () {
       this.id = this.$route.query.paymentId;
       // 获取缴费状态
       getMusicGroupPaymentCalenderDetail({ id: this.id }).then((res) => {
@@ -511,9 +483,9 @@ export default {
           }
           this.titleForm = {
             paymentType: res.data.calender.paymentType,
-            musicGroupOrganizationCourseSettingId:res.data.calenderSettingsName,
+            musicGroupOrganizationCourseSettingId: res.data.calenderSettingsName,
             paymentPattern: paymentPatternType[res.data.calender.paymentPattern],
-            paymentValidStartDate:res.data.calender.paymentValidStartDate,
+            paymentValidStartDate: res.data.calender.paymentValidStartDate,
             paymentValidEndDate: res.data.calender.paymentValidEndDate,
             calenderSettingsName: res.data.calenderSettingsName,
           };
@@ -532,11 +504,11 @@ export default {
         }
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         search: null,
         subjectId: null,
@@ -544,10 +516,10 @@ export default {
       };
       this.search();
     },
-    checkSelect(val) {
+    checkSelect (val) {
       return val.paymentStatus == "NON_PAYMENT";
     },
-    resetPay() {
+    resetPay () {
       // this.activeRow = row;
       if (this.activeChiose.length < 1) {
         this.$message.error("请至少选择一名学员");
@@ -562,17 +534,18 @@ export default {
     // resetTime () {
     //   this.payVisible = true;
     // },
-    goBack() {
+    goBack () {
       let query = this.$route.query;
-      if(query.type == 'resetTeam'){
-        sessionStorage.setItem('resetCode','3')
+      if (query.type == 'resetTeam') {
+        sessionStorage.setItem('resetCode', '3')
       }
       this.$router.go(-1)
     },
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.activeChiose = val;
+      console.log(val)
     },
-    startPay() {
+    startPay () {
       if (this.activeChiose.length < 1) {
         this.$message.error("请至少选择一名学员");
         return;
@@ -591,7 +564,7 @@ export default {
         }
       });
     },
-    submitReset() {
+    submitReset () {
       let obj = {};
       obj.expectAmount = this.resetPayForm.momey;
       obj.ids = this.ids;
@@ -603,7 +576,7 @@ export default {
         }
       });
     },
-    addStudentBtn() {
+    addStudentBtn () {
       console.log(
         "musicGroupId:",
         this.teamid,
@@ -621,7 +594,7 @@ export default {
         }
       });
     },
-    delStudentBtn() {
+    delStudentBtn () {
       if (this.activeChiose.length < 1) {
         this.$message.error("请至少选择一名学员");
         return;
@@ -646,12 +619,12 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.chioseStudent = val;
     },
-    submitAddStudent() {
+    submitAddStudent () {
       if (!this.chioseStudent) {
         this.$message.error("请选择学员");
         return;
@@ -667,7 +640,7 @@ export default {
         }
       });
     },
-    onMusicGroupPaymentCalenderDetail() {
+    onMusicGroupPaymentCalenderDetail () {
       let searchForm = this.searchForm;
       // 报表导出
       let url = "/api-web/export/musicGroupPaymentCalenderDetail";
@@ -720,15 +693,15 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    cancleAdd(row) {
+    cancleAdd (row) {
       this.$refs.singleTable.setCurrentRow(row);
       this.studentVisible = false;
     },
   },
   watch: {
-    payVisible(val) {
+    payVisible (val) {
       if (!val) {
         this.payForm = {
           startDate: null,
@@ -736,7 +709,7 @@ export default {
         this.$refs["payForm"].resetFields();
       }
     },
-    resetPayVisible(val) {
+    resetPayVisible (val) {
       if (!val) {
         this.resetPayForm = {
           momey: null,
@@ -744,21 +717,7 @@ export default {
       }
     },
   },
-  computed:{
-    infoMsg(){
-      // courseType
-      let str = ''
-      this.msgList.forEach(item=>{
-      courseType.forEach(course=>{
-         if(item.courseType == course.value){
-           str += `${course.label}/${item.courseTotalMinuties}分钟、`
-         }
-       })
-      })
-      str = str.substring(0,str.length-1)+'。'
-      return str
-    }
-  }
+
 };
 </script>
 <style lang='scss' scoped>
@@ -811,6 +770,7 @@ export default {
 .wrap {
   display: flex;
   flex-direction: row;
+  justify-content: flex-start;
   div {
     margin-right: 20px;
   }

+ 68 - 0
src/views/resetTeaming/modals/studentPayDetail.vue

@@ -0,0 +1,68 @@
+<template>
+  <div>
+    <el-form ref="titleForm"
+             :model="titleForm"
+             label-width="80px">
+      <el-form-item label="缴费类型">
+        <div class="inputStyle">{{ titleForm.paymentType| auditPaymentType}}</div>
+      </el-form-item>
+      <el-form-item label="收费标准">
+        <div class="inputStyle">{{ titleForm.musicGroupOrganizationCourseSettingId }}</div>
+      </el-form-item>
+      <el-form-item label="缴费方式">
+        <div class="inputStyle">{{ titleForm.paymentPattern }}</div>
+      </el-form-item>
+      <el-form-item label="缴费周期">
+        <div class="inputStyle">
+          {{ titleForm.paymentValidStartDate|formatTimer }}~{{
+            titleForm.paymentValidEndDate|formatTimer
+          }}
+        </div>
+      </el-form-item>
+      <el-form-item label="课程详情">
+        <div class="inputStyle"
+             style="width:500px">
+          <p v-for="(item,index) in msgList">{{item.courseType | coursesType}}: 课程时长:{{item.courseTotalMinuties}}分钟 原价:{{item.courseOriginalPrice}}元 现价{{item.courseCurrentPrice}}元</p>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { courseType } from '@/utils/searchArray'
+export default {
+  props: ['msgList', 'titleForm'],
+  data () {
+    return {
+      // titleForm: {
+      //   paymentType: "",
+      //   musicGroupOrganizationCourseSettingId: "",
+      //   paymentPattern: "",
+      //   paymentValidStartDate: "",
+      //   paymentValidEndDate: "",
+      //   calenderSettingsName: "",
+      // },
+
+    }
+  },
+  mounted () { },
+  methods: {},
+  computed: {
+    infoMsg () {
+      // courseType
+      let str = ''
+      this.msgList.forEach(item => {
+        courseType.forEach(course => {
+          if (item.courseType == course.value) {
+            str += `${course.label}/${item.courseTotalMinuties}分钟、`
+          }
+        })
+      })
+      str = str.substring(0, str.length - 1) + '。'
+      return str
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

+ 8 - 1
src/views/teamBuild/components/teamBaseInfo.vue

@@ -258,7 +258,13 @@
           <el-checkbox v-model.trim="topFrom.isClass"
                        :disabled="basdisabled">课堂课乐团</el-checkbox>
         </el-form-item>
+        <br>
+        <el-form-item label=""
+                      v-if=" teamStatus == 'teamDraft'">
+          <p style="color:red; padding-left:50px">修改<<收费类型>>会重置乐团声部与缴费信息</p>
+        </el-form-item>
       </el-form>
+
       <!-- <div class="checkList">
         <div class="head noMargin">乐团课程:</div>
         <div class="checkRow">
@@ -448,7 +454,7 @@
              v-if="
             teamStatus == 'newTeam' ||
             teamStatus == 'teamDraft' ||
-            teamStatus == 'teamAudit' || 'feeAudit'
+            teamStatus == 'teamAudit' ||  teamStatus =='feeAudit'
           ">
           下一步
         </div>
@@ -982,6 +988,7 @@ export default {
             // this.resetSubmit();
             this.$emit("chiosetab", num);
           }
+          this.init()
         }
       });
     },

+ 13 - 2
src/views/teamDetail/teamInfo.vue

@@ -24,13 +24,23 @@
           <soundeDetail v-if="activeIndex == '2'"
                         :teamid='teamid' />
         </el-tab-pane>
+        <el-tab-pane label="学员缴费信息"
+                     name="3">
+          <resetPayList v-if="activeIndex == '3'" />
+        </el-tab-pane>
+        <el-tab-pane label="学校缴费信息"
+                     name="4">
+          <resetPayListSchool v-if="activeIndex == '4'" />
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
 </template>
 <script>
 import baseInfo from '@/views/teamBuild/components/teamBaseInfo'
-import soundeDetail from '@/views/resetTeaming/components/resetSoundv2' 
+import soundeDetail from '@/views/resetTeaming/components/resetSoundv2'
+import resetPayList from '@/views/resetTeaming/components/resetPayList'
+import resetPayListSchool from '@/views/resetTeaming/components/resetPayListSchool'
 export default {
   data () {
     return {
@@ -89,7 +99,8 @@ export default {
   },
   components: {
     baseInfo,
-    soundeDetail
+    soundeDetail,
+    resetPayList, resetPayListSchool,
   }
 }
 </script>