feat:订单管理-订单金额改成交费总数

This commit is contained in:
yangqingyuan
2024-08-11 00:20:19 +08:00
parent a2ddc3c88f
commit fb3125c4cf
3 changed files with 11 additions and 8 deletions

View File

@@ -45,6 +45,8 @@ export interface Order {
goodsId?: number; goodsId?: number;
// 总金额 // 总金额
totalPrice?: number; totalPrice?: number;
//缴费总数
totalPayPrice?:number;
// 发货状态 // 发货状态
deliveryStatus?: number; deliveryStatus?: number;
// 收货状态 // 收货状态

View File

@@ -86,7 +86,7 @@
</template> </template>
<template v-if="column.key === 'createTime'"> <template v-if="column.key === 'createTime'">
<a-tooltip :title="`${toDateString(record.createTime)}`"> <a-tooltip :title="`${toDateString(record.createTime)}`">
{{ timeAgo(record.createTime) }} {{ toDateString(record.createTime) }}
</a-tooltip> </a-tooltip>
</template> </template>
<template v-if="column.key === 'action'"> <template v-if="column.key === 'action'">
@@ -225,8 +225,9 @@
{ {
title: '租赁状态', title: '租赁状态',
dataIndex: 'leaseStatus', dataIndex: 'leaseStatus',
sorter: true, //sorter: true,
key: 'leaseStatus' key: 'leaseStatus',
hideInTable:true
}, },
{ {
title: '电池状态', title: '电池状态',

View File

@@ -36,14 +36,14 @@
</span> </span>
</div> </div>
</template> </template>
<template v-if="column.key === 'totalPrice'"> <template v-if="column.key === 'totalPayPrice'">
<p> <p>
<span class="ele-text-warning price-edit"> <span class="ele-text-warning price-edit">
{{ record.totalPrice }} {{ record.totalPayPrice }}
</span> </span>
<form-outlined <form-outlined
v-if="record.payStatus === 10" v-if="record.payStatus === 10"
@click="onEdit('totalPrice', record.totalPrice, record)" @click="onEdit('totalPayPrice', record.totalPrice, record)"
/></p> /></p>
<p class="ele-text-placeholder" <p class="ele-text-placeholder"
>(含运费{{ record.expressPrice }})</p >(含运费{{ record.expressPrice }})</p
@@ -323,8 +323,8 @@
}, },
{ {
title: '订单金额(元)', title: '订单金额(元)',
dataIndex: 'totalPrice', dataIndex: 'totalPayPrice',
key: 'totalPrice', key: 'totalPayPrice',
ellipsis: true ellipsis: true
}, },
{ {