|
|
@@ -175,8 +175,7 @@
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- const type = reportType.value
|
|
|
- const detailType = search.detail_type
|
|
|
+ const type = detailType.value
|
|
|
|
|
|
// 根据不同的列 prop 进行合计数据显示和格式化
|
|
|
const prop = column.prop
|
|
|
@@ -185,60 +184,18 @@
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (type == 1) {
|
|
|
- if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- } else if (type == 2) {
|
|
|
- if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
|
|
|
+ if (type == 4) {
|
|
|
+ if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
|
|
|
sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
} else {
|
|
|
sums[index] = ''
|
|
|
}
|
|
|
- } else if (type == 3) {
|
|
|
- if (detailType == 4) {
|
|
|
- if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- }
|
|
|
- } else if (type == 4) {
|
|
|
- if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- } else if (type == 6) {
|
|
|
- if (prop === 'amount') {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- } else if (type == 7) {
|
|
|
- if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
|
|
|
+ } else {
|
|
|
+ if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
|
|
|
sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
|
|
|
} else {
|
|
|
sums[index] = ''
|
|
|
}
|
|
|
- } else if (type == 24) {
|
|
|
- if (prop === 'volume') {
|
|
|
- sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
|
|
|
- } else if (prop === 'rebate') {
|
|
|
- sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
- }
|
|
|
- } else {
|
|
|
- sums[index] = ''
|
|
|
}
|
|
|
})
|
|
|
|