对账更新
This commit is contained in:
parent
daf48fd67b
commit
be030610b6
|
@ -130,6 +130,11 @@ export const PayBillStatus = {
|
|||
CANCEL: "4", // 已取消
|
||||
REFUNDING: "5", // 退款中
|
||||
REFUNDED: "6", // 已退款
|
||||
|
||||
// 已支付的状态
|
||||
payedList() {
|
||||
return [this.PAY_SUCCESS, this.REFUNDING, this.REFUNDED];
|
||||
}
|
||||
}
|
||||
|
||||
// 充值订单状态
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<div>
|
||||
<el-row style="margin-bottom: 16px">
|
||||
<date-range-picker
|
||||
:start-date.sync="queryParams.startDate"
|
||||
:end-date.sync="queryParams.endDate"
|
||||
:start-date.sync="queryParams.payDateStart"
|
||||
:end-date.sync="queryParams.payDateEnd"
|
||||
@change="getList"
|
||||
/>
|
||||
</el-row>
|
||||
|
@ -16,7 +16,7 @@ import { getLastDateStr } from '@/utils'
|
|||
import { getBillDailyAmount } from '@/api/system/dashboard'
|
||||
import DateRangePicker from '@/components/DateRangePicker/index.vue'
|
||||
import DailyBillAmountReport from '@/views/dashboard/DailyBillAmountReport.vue'
|
||||
import { RechargeStatus, TransactionBillType } from '@/utils/constants'
|
||||
import { PayBillStatus } from '@/utils/constants'
|
||||
|
||||
export default {
|
||||
name: 'DailyBillAmountChart',
|
||||
|
@ -25,10 +25,9 @@ export default {
|
|||
return {
|
||||
// 查询条件
|
||||
queryParams: {
|
||||
startDate: getLastDateStr(6),
|
||||
endDate: getLastDateStr(0),
|
||||
type: TransactionBillType.RECHARGE,
|
||||
statusList: RechargeStatus.payedOrder()
|
||||
payDateStart: getLastDateStr(6),
|
||||
payDateEnd: getLastDateStr(0),
|
||||
statusList: PayBillStatus.payedList()
|
||||
},
|
||||
billData: []
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ export default {
|
|||
}
|
||||
}],
|
||||
series: [{
|
||||
name: '订单金额',
|
||||
name: '支付金额',
|
||||
type: 'line',
|
||||
data: this.billData.map(item => item.total),
|
||||
itemStyle: {
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
<el-row :gutter="8">
|
||||
<el-col :lg="12" :xs="24">
|
||||
<el-card header="订单对账" class="card-box">
|
||||
<el-card header="支付对账" class="card-box">
|
||||
<daily-bill-amount-chart/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
|
|
Loading…
Reference in New Issue
Block a user