fix bug
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-06 20:20:26
|
* @Date : 2021-12-06 20:20:26
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-10 10:30:22
|
* @LastEditTime : 2022-02-10 14:44:36
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -138,7 +138,12 @@
|
|||||||
<nz-card nzTitle="运费信息" #distannce3>
|
<nz-card nzTitle="运费信息" #distannce3>
|
||||||
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}(以发货为准,保留小数)</h2>
|
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}(以发货为准,保留小数)</h2>
|
||||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||||
|
<ng-template st-row="price" let-item let-index="index">
|
||||||
|
{{ item.price | currency}}
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="surcharge" let-item let-index="index">
|
||||||
|
{{ item.surcharge | currency}}
|
||||||
|
</ng-template>
|
||||||
</st>
|
</st>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@ -33,8 +33,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
|||||||
isVisible = false;
|
isVisible = false;
|
||||||
logColumns: STColumn[] = [
|
logColumns: STColumn[] = [
|
||||||
{ title: '款项', index: 'expenseName' },
|
{ title: '款项', index: 'expenseName' },
|
||||||
{ title: '运输费(元)', index: 'price' },
|
{ title: '运输费(元)', render: 'price' },
|
||||||
{ title: '附加费(元)', index: 'surcharge' },
|
{ title: '附加费(元)', render: 'surcharge' },
|
||||||
{ title: '支付时间', index: ' paymentTime' },
|
{ title: '支付时间', index: ' paymentTime' },
|
||||||
{
|
{
|
||||||
title: '支付状态',
|
title: '支付状态',
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-28 14:42:03
|
* @Date : 2021-12-28 14:42:03
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-10 14:24:33
|
* @LastEditTime : 2022-02-10 14:45:46
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -128,7 +128,14 @@
|
|||||||
</nz-card>
|
</nz-card>
|
||||||
|
|
||||||
<nz-card nzTitle="运费信息" #distannce3>
|
<nz-card nzTitle="运费信息" #distannce3>
|
||||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
|
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||||
|
<ng-template st-row="price" let-item let-index="index">
|
||||||
|
{{ item.price | currency}}
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="surcharge" let-item let-index="index">
|
||||||
|
{{ item.surcharge | currency}}
|
||||||
|
</ng-template>
|
||||||
|
</st>
|
||||||
<div>
|
<div>
|
||||||
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
||||||
(运费{{i?.totalFreight | currency}},
|
(运费{{i?.totalFreight | currency}},
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-28 14:42:03
|
* @Date : 2021-12-28 14:42:03
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-01-20 20:09:47
|
* @LastEditTime : 2022-02-10 14:45:47
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -35,9 +35,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
|||||||
isVisible = false;
|
isVisible = false;
|
||||||
logColumns: STColumn[] = [
|
logColumns: STColumn[] = [
|
||||||
{ title: '款项', index: 'expenseCodeLabel' },
|
{ title: '款项', index: 'expenseCodeLabel' },
|
||||||
{ title: '小计(元)', index: 'price' },
|
{ title: '小计(元)', render: 'price' },
|
||||||
{ title: '运输费(元)', index: 'price' },
|
{ title: '运输费(元)', render: 'price' },
|
||||||
{ title: '附加费(元)', index: 'surcharge' },
|
{ title: '附加费(元)', render: 'surcharge' },
|
||||||
{ title: '支付时间', index: 'paymentTime' },
|
{ title: '支付时间', index: 'paymentTime' },
|
||||||
{
|
{
|
||||||
title: '支付状态',
|
title: '支付状态',
|
||||||
|
|||||||
Reference in New Issue
Block a user