|
|
|
@ -196,7 +196,7 @@ |
|
|
|
|
(nzPageIndexChange)="requestOrderData($event)" |
|
|
|
|
(nzPageSizeChange)="pageSizeChang($event)" |
|
|
|
|
[nzPageSizeOptions]="[10,20,50,100]" |
|
|
|
|
[nzScroll]="{ x: '3400px'}" |
|
|
|
|
[nzScroll]="{ x: '3600px'}" |
|
|
|
|
> |
|
|
|
|
<thead> |
|
|
|
|
<tr> |
|
|
|
@ -205,7 +205,7 @@ |
|
|
|
|
<th rowspan="2" *ngIf="roleType != 3 && roleType != 10" nzWidth="200px">加油站</th> |
|
|
|
|
<th rowspan="2" *ngIf="roleType != 10" nzWidth="120px">加油员</th> |
|
|
|
|
<th colspan="9">加油信息</th> |
|
|
|
|
<th colspan="5">支付信息</th> |
|
|
|
|
<th colspan="7">支付信息</th> |
|
|
|
|
<th rowspan="2">交易状态</th> |
|
|
|
|
<th rowspan="2">创建时间</th> |
|
|
|
|
<th rowspan="2">支付时间</th> |
|
|
|
@ -229,6 +229,8 @@ |
|
|
|
|
<th>油站价</th> |
|
|
|
|
<th>国标价</th> |
|
|
|
|
<th>支付方式</th> |
|
|
|
|
<th>总优惠</th> |
|
|
|
|
<th>优惠券优惠</th> |
|
|
|
|
<th>加油优惠</th> |
|
|
|
|
<th>应付金额</th> |
|
|
|
|
<th>积分抵扣</th> |
|
|
|
@ -251,7 +253,9 @@ |
|
|
|
|
<td>{{data.gasPriceGun}}元</td> |
|
|
|
|
<td>{{data.gasPriceOfficial}}元</td> |
|
|
|
|
<td>{{data.payType | orderPayType}}</td> |
|
|
|
|
<td>{{data.deductionPrice}}元</td> |
|
|
|
|
<td>{{data.totalDeductionPrice}}元</td> |
|
|
|
|
<td>{{data.deductionCouponPrice}}元</td> |
|
|
|
|
<td>{{data.deductionProductPrice}}元</td> |
|
|
|
|
<td>{{data.payablePrice}}元</td> |
|
|
|
|
<td>{{data.payGold / 100}}元</td> |
|
|
|
|
<td>{{data.payPrice!=null?data.payPrice+'元':'未支付'}}</td> |
|
|
|
@ -304,9 +308,13 @@ |
|
|
|
|
<nz-divider nzText="支付信息"></nz-divider> |
|
|
|
|
<nz-descriptions nzBordered [nzColumn]="3" [nzSize]="'middle'"> |
|
|
|
|
<nz-descriptions-item nzTitle="交易总额" >{{orderDetailObject.tradeOrder.totalPrice}} 元</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="优惠金额">{{orderDetailObject.tradeOrder.deductionPrice}} 元</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="优惠信息" nzSpan="2"> |
|
|
|
|
<span nz-typography>总优惠: {{orderDetailObject.tradeOrder.totalDeductionPrice}} 元</span><br> |
|
|
|
|
<span nz-typography>加油优惠: {{orderDetailObject.tradeOrder.deductionProductPrice}} 元</span><br> |
|
|
|
|
<span nz-typography>优惠券优惠: {{orderDetailObject.tradeOrder.deductionCouponPrice}} 元</span><br> |
|
|
|
|
</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="应付金额" >{{orderDetailObject.tradeOrder.payablePrice}} 元</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzSpan="2" nzTitle="积分抵扣">{{orderDetailObject.tradeOrder.payGold / 100}} 元 </nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="积分抵扣" >{{orderDetailObject.tradeOrder.payGold / 100}} 元 </nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="实付金额" > |
|
|
|
|
{{orderDetailObject.tradeOrder.payRealPrice!=null?orderDetailObject.tradeOrder.payRealPrice+' 元':'未支付'}} |
|
|
|
|
</nz-descriptions-item> |
|
|
|
|