feat:统计日期修改显示,支付改成支付宝,续费增加是否支付列
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
import VChart from 'vue-echarts';
|
||||
import { getSaleroomList, getVisitHourList } from "@/api/dashboard/analysis";
|
||||
import useEcharts from '@/utils/use-echarts';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
use([
|
||||
CanvasRenderer,
|
||||
@@ -60,7 +61,7 @@
|
||||
{
|
||||
type: 'category',
|
||||
boundaryGap: false,
|
||||
data: data.map((d) => d.startStatisticsDate)
|
||||
data: data.map((d) => dayjs(d.startStatisticsDate).format('YYYY-MM-DD'))
|
||||
}
|
||||
],
|
||||
yAxis: [
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<template v-if="column.key === 'action' && record.applyStatus == 10">
|
||||
<a-space>
|
||||
<a-popconfirm
|
||||
title="确定已完成线下打款?"
|
||||
title="确定通过支付宝线上打款?"
|
||||
@confirm="auditOffline(record)">
|
||||
<a class="ele-text-success">通过</a>
|
||||
</a-popconfirm>
|
||||
@@ -259,7 +259,7 @@
|
||||
const auditOffline = (param) => {
|
||||
pass({
|
||||
id: param.id,
|
||||
payType: 40
|
||||
payType: 20
|
||||
}).then(result => {
|
||||
message.success(result)
|
||||
reload()
|
||||
|
||||
@@ -38,6 +38,11 @@
|
||||
{{ record.merchantName }}
|
||||
</template>
|
||||
|
||||
<template v-if="column.key === 'payStatus'">
|
||||
<span v-if="record.payStatus === 20" color="green">已付</span>
|
||||
<span v-if="record.payStatus === 10" color="red">未付</span>
|
||||
</template>
|
||||
|
||||
<template v-if="column.key === 'orderSource'">
|
||||
<span v-if="record.orderSource === 10" color="green"
|
||||
>普通订单</span
|
||||
@@ -134,6 +139,11 @@
|
||||
dataIndex: 'payPrice',
|
||||
key: 'payPrice'
|
||||
},
|
||||
{
|
||||
title: '是否付款',
|
||||
dataIndex: 'payStatus',
|
||||
key: 'payStatus'
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
dataIndex: 'createTime',
|
||||
|
||||
Reference in New Issue
Block a user