|
|
@@ -54,7 +54,7 @@
|
|
54
|
54
|
</el-table-column>
|
|
55
|
55
|
</el-table>
|
|
56
|
56
|
<el-table show-summary :summary-method="getSummaries" :data="combine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
|
|
57
|
|
- <el-table-column :label="`${this.data.secondLayer.GambleMember.name}的會員`" align="center">
|
|
|
57
|
+ <el-table-column :label="`${(this.data.secondLayer.GambleMember.name).slice(19)}的會員`" align="center">
|
|
58
|
58
|
<el-table-column label="名稱" align="center">
|
|
59
|
59
|
<template slot-scope="scope">
|
|
60
|
60
|
<span>{{scope.row.name}}</span>
|
|
|
@@ -231,7 +231,7 @@ export default {
|
|
231
|
231
|
|
|
232
|
232
|
row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).times(row.feeRatio).valueOf())
|
|
233
|
233
|
let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
|
|
234
|
|
- // console.log('type', chipsLog)
|
|
|
234
|
+ console.log('type', chipsLog)
|
|
235
|
235
|
if (chipsLog['0'] || chipsLog['2']) {
|
|
236
|
236
|
row.totalUp = _.sumBy(chipsLog['0'], (item) => {
|
|
237
|
237
|
return item.chips > 0 ? item.chips : 0
|
