|
|
@@ -2,7 +2,22 @@
|
|
|
<div class='container'>
|
|
|
<el-form :inline="true"
|
|
|
v-model="topForm">
|
|
|
-
|
|
|
+
|
|
|
+ <el-form-item label="乐团">
|
|
|
+ <el-select v-model="topForm.team" @change="handleItemChange" placeholder="请选择分部名称">
|
|
|
+ <el-option v-for='(item,index) in brancheList'
|
|
|
+ :key='index'
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-select v-model="topForm.instruments" placeholder="请选择乐团名称">
|
|
|
+ <el-option v-for='(item,index) in instrumentList'
|
|
|
+ :key='index'
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
+ </el-select> -->
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="支付时间">
|
|
|
<el-date-picker
|
|
|
v-model="paymentTime"
|
|
|
@@ -26,13 +41,21 @@
|
|
|
@click="resetStudentList">重置</el-button>
|
|
|
<el-button plain
|
|
|
@click="exportis">导出</el-button>
|
|
|
+ <br />
|
|
|
+ <p>
|
|
|
+ <span style="padding-right: 12px;">总金额：{{ amountAll.amount }}元</span>
|
|
|
+ <span style="padding-right: 12px;">课程：{{ amountAll.tuiFeeAmount }}元</span>
|
|
|
+ <span style="padding-right: 12px;">商品：{{ amountAll.goodsFeeAmount }}元</span>
|
|
|
+ <span style="padding-right: 12px;">教辅：{{ amountAll.sdFeeAmount }}元</span>
|
|
|
+ <span style="padding-right: 12px;">手续费：{{ amountAll.commissionAmount }}元</span>
|
|
|
+ </p>
|
|
|
</el-form>
|
|
|
<div class="tableWrap">
|
|
|
- <el-table :data='tableList'
|
|
|
- id='tableid'
|
|
|
- height="calc(100vh - 174px)"
|
|
|
+ <!-- height="calc(100vh - 174px)"
|
|
|
show-summary
|
|
|
- :summary-method="getSummaries">
|
|
|
+ :summary-method="getSummaries" -->
|
|
|
+ <el-table :data='tableList'
|
|
|
+ id='tableid'>
|
|
|
<el-table-column type="index"
|
|
|
width="55"></el-table-column>
|
|
|
<el-table-column align="center"
|
|
|
@@ -61,6 +84,9 @@
|
|
|
label="教辅费用"
|
|
|
prop="sdFee"></el-table-column>
|
|
|
<el-table-column align="center"
|
|
|
+ label="手续费"
|
|
|
+ prop="commission"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
label="专业"
|
|
|
prop="voicyPart"></el-table-column>
|
|
|
<el-table-column align="left"
|
|
|
@@ -86,7 +112,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { orderListPage, getMusicTeams } from "@/api/table";
|
|
|
+import { getBranches, orderListPage, getMusicTeams } from "@/api/table";
|
|
|
import qs from "qs";
|
|
|
import { scrollTo } from '@/utils/scroll-to'
|
|
|
export default {
|
|
|
@@ -136,7 +162,8 @@ export default {
|
|
|
},//cascader 数据格式化
|
|
|
branchId: '',
|
|
|
classId: '',
|
|
|
- account: this.$route.query.account // 财务唯一标识
|
|
|
+ account: this.$route.query.account, // 财务唯一标识
|
|
|
+ amountAll: {}, // 金额集合
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -151,6 +178,7 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
if(this.account) {
|
|
|
+ this.getBranches();
|
|
|
this.getstudentList()
|
|
|
}
|
|
|
},
|
|
|
@@ -160,11 +188,31 @@ export default {
|
|
|
// this.rows = pageSize;
|
|
|
this.getstudentList();
|
|
|
},
|
|
|
+ // 获取选项卡
|
|
|
+ getBranches () {
|
|
|
+ getBranches().then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ let arr = [];
|
|
|
+ res.data.map(item => {
|
|
|
+ arr.push({
|
|
|
+ value: item.branchId,
|
|
|
+ label: item.branchName,
|
|
|
+ children: []
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.brancheList = arr
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
getstudentList (rows, callBack) {
|
|
|
if(!this.account) {
|
|
|
this.$message.error('您没有权限')
|
|
|
return false
|
|
|
}
|
|
|
+ if(this.account != 'per' || this.account != 'com') {
|
|
|
+ this.$message.error('您没有权限')
|
|
|
+ return false
|
|
|
+ }
|
|
|
if(rows && typeof rows == 'number' ) {
|
|
|
this.rows = rows
|
|
|
} else {
|
|
|
@@ -185,8 +233,16 @@ export default {
|
|
|
type: params.money,
|
|
|
startTime: startTime,
|
|
|
endTime: endTime})).then(res => {
|
|
|
- this.tableList = res.data.rows;
|
|
|
- this.total = res.data.total;
|
|
|
+ let data = res.data
|
|
|
+ this.tableList = data.rows;
|
|
|
+ this.total = data.total;
|
|
|
+ this.amountAll = {
|
|
|
+ amount: data.amount,
|
|
|
+ tuiFeeAmount: data.tuiFeeAmount,
|
|
|
+ goodsFeeAmount: data.goodsFeeAmount,
|
|
|
+ sdFeeAmount: data.sdFeeAmount,
|
|
|
+ commissionAmount: data.commissionAmount
|
|
|
+ }
|
|
|
// 回调函数
|
|
|
if(callBack && typeof callBack == 'function') {
|
|
|
callBack()
|
|
|
@@ -307,28 +363,25 @@ export default {
|
|
|
if (!val) {
|
|
|
return false
|
|
|
}
|
|
|
- getMusicTeams(qs.stringify({ branchId: val })).then(res => {
|
|
|
- this.topForm.instruments = ''
|
|
|
- // res.data.rows
|
|
|
- // 1.格式化数据
|
|
|
- // 2.追加数据到相应的位置
|
|
|
- if (res.code == 200) {
|
|
|
- let arr = [];
|
|
|
- res.data.rows.map(item => {
|
|
|
- arr.push({
|
|
|
- label: item.name,
|
|
|
- value: item.id
|
|
|
- })
|
|
|
- })
|
|
|
- this.instrumentList = arr
|
|
|
- // for (let item in this.brancheList) {
|
|
|
- // if (this.brancheList[item].value == val) {
|
|
|
- // this.brancheList[item].children = arr;
|
|
|
- // }
|
|
|
- // }
|
|
|
- }
|
|
|
+ // getMusicTeams(qs.stringify({ branchId: val })).then(res => {
|
|
|
+ // this.topForm.instruments = ''
|
|
|
+ // if (res.code == 200) {
|
|
|
+ // let arr = [];
|
|
|
+ // res.data.rows.map(item => {
|
|
|
+ // arr.push({
|
|
|
+ // label: item.name,
|
|
|
+ // value: item.id
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // this.instrumentList = arr
|
|
|
+ // for (let item in this.brancheList) {
|
|
|
+ // if (this.brancheList[item].value == val) {
|
|
|
+ // this.brancheList[item].children = arr;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- })
|
|
|
+ // })
|
|
|
},
|
|
|
handleChange (val) {
|
|
|
if (val) {
|
