|
|
@@ -52,16 +52,6 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center"
|
|
|
- prop="expectNum"
|
|
|
- width="200"
|
|
|
- label="缴费人数(预计/实际)">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div>
|
|
|
- {{scope.row.expectNum}}/{{scope.row.actualNum}}
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column align="center"
|
|
|
prop="paymentPattern"
|
|
|
label="缴费方式">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -71,16 +61,21 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center"
|
|
|
- prop="paymentValidStartDate"
|
|
|
- width="200"
|
|
|
- label="缴费有效期">
|
|
|
+ prop="addCourseTotalTime"
|
|
|
+ width="150px"
|
|
|
+ label="加课总时长">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ width="150px"
|
|
|
+ prop="courseCurrentPrice"
|
|
|
+ label="现价">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- {{ scope.row.paymentValidStartDate | formatTimer }} ~ {{ scope.row.paymentValidEndDate | formatTimer }}
|
|
|
+ {{ scope.row.courseCurrentPrice | moneyFormat }}
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center"
|
|
|
+ <!-- <el-table-column align="center"
|
|
|
prop="status"
|
|
|
label="缴费状态">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -88,19 +83,31 @@
|
|
|
{{ scope.row.status | payTypeStatus }}
|
|
|
</div>
|
|
|
</template>
|
|
|
+ </el-table-column> -->
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="operatorName"
|
|
|
+ label="责任人">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center"
|
|
|
prop="memo"
|
|
|
- label="备注"></el-table-column>
|
|
|
+ width="200px"
|
|
|
+ label="备注">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <overflow-text width="200px" :text="scope.row.memo"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作"
|
|
|
fixed="right"
|
|
|
- min-width="260px">
|
|
|
+ min-width="60px">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
<el-button type="text"
|
|
|
+ @click="lookList(scope.row)"
|
|
|
+ v-permission="'musicGroupPaymentCalender/queryPage'">查看</el-button>
|
|
|
+ <!-- <el-button type="text"
|
|
|
@click="lookDetail(scope.row)"
|
|
|
- v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
|
|
|
- <el-button type="text"
|
|
|
+ v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
|
|
|
+ <!-- <el-button type="text"
|
|
|
@click="openChioseStudent(scope.row)"
|
|
|
v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
|
|
|
v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
|
|
|
@@ -108,11 +115,14 @@
|
|
|
v-if="scope.row.status == 'REJECT'&&teamStatus"
|
|
|
v-permission="'musicGroupPaymentCalender/update'"
|
|
|
@click="resetPay(scope.row)">修改</el-button>
|
|
|
+
|
|
|
+ <el-button type="text"
|
|
|
+ v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
|
|
|
+ @click="onCreateQRCode(scope.row)">续费二维码</el-button>
|
|
|
<el-button type="text"
|
|
|
- v-permission="'musicGroupPaymentCalender/makesureSchoolePaid'"
|
|
|
- v-if="scope.row.status == 'OPEN'&&teamType=='resetTeam'"
|
|
|
- @click="commmitGetMoney(scope.row)">确认收款</el-button>
|
|
|
- <!-- <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
|
|
|
+ v-if="isNewGropu"
|
|
|
+ v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
|
|
|
+ @click="onPreview(scope.row)">预览</el-button> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -241,6 +251,22 @@
|
|
|
@click="resetPayDate">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="itemsVisible"
|
|
|
+ title="查看缴费计划"
|
|
|
+ width="1000px"
|
|
|
+ >
|
|
|
+ <pay-items
|
|
|
+ v-if="itemsVisible"
|
|
|
+ :batchNo="viewDetail && viewDetail.batchNo"
|
|
|
+ payUserType="STUDENT"
|
|
|
+ :teamStatus="teamStatus"
|
|
|
+ @lookDetail="lookDetail"
|
|
|
+ @openChioseStudent="openChioseStudent"
|
|
|
+ @resetPay="resetPay"
|
|
|
+ @close="itemsVisible = false"
|
|
|
+ />
|
|
|
+ </el-dialog>
|
|
|
<el-dialog title="查看"
|
|
|
:visible.sync="reviewVisible"
|
|
|
width="900px"
|
|
|
@@ -321,9 +347,11 @@ import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicG
|
|
|
import {
|
|
|
getOrganizationCourseUnitPriceSettings
|
|
|
} from '@/api/specialSetting'
|
|
|
+import { getAuditList } from '@/api/auditManager'
|
|
|
import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd } from '../api'
|
|
|
import setStudentFee from './studentPayBase'
|
|
|
import userPayForm from '../modals/user-pay-form'
|
|
|
+import payItems from '../modals/pay-items'
|
|
|
import schoolPayForm from '../modals/school-pay-form'
|
|
|
import isGetMoney from '../modals/isGetMoney'
|
|
|
import review from '../modals/review'
|
|
|
@@ -342,6 +370,7 @@ export default {
|
|
|
review,
|
|
|
reviewDetail,
|
|
|
teamType: '',
|
|
|
+ 'pay-items': payItems,
|
|
|
isGetMoney
|
|
|
},
|
|
|
data () {
|
|
|
@@ -351,6 +380,7 @@ export default {
|
|
|
userVisible: false,
|
|
|
schoolVisible: false,
|
|
|
reviewVisible: false,
|
|
|
+ itemsVisible: false,
|
|
|
teamType: this.$route.query.type,
|
|
|
organizationCourseUnitPriceSettings: [],
|
|
|
searchForm: {
|
|
|
@@ -451,10 +481,10 @@ export default {
|
|
|
},
|
|
|
getList () {
|
|
|
let musicGroupId = this.$route.query.id
|
|
|
- return musicGroupPaymentCalenderQueryPage({
|
|
|
+ return getAuditList({
|
|
|
page: this.rules.page,
|
|
|
rows: this.rules.limit,
|
|
|
- musicGroupId,
|
|
|
+ search: musicGroupId,
|
|
|
payUserType: 'SCHOOL',
|
|
|
paymentType: this.searchForm.paymentType,
|
|
|
}).then(res => {
|
|
|
@@ -519,6 +549,10 @@ export default {
|
|
|
})
|
|
|
.catch(() => { });
|
|
|
},
|
|
|
+ lookList(row) {
|
|
|
+ this.viewDetail = row
|
|
|
+ this.itemsVisible = true
|
|
|
+ },
|
|
|
lookDetail (row) {
|
|
|
let query = this.$route.query;
|
|
|
this.$route.query.paymentId = row.id;
|
wolyshaw