解决冲突

This commit is contained in:
wangshiming
2022-02-24 10:45:58 +08:00
parent 6881329df6
commit a4a2b45911

View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-22 15:40:02 * @LastEditTime : 2022-02-24 10:45:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -16,7 +16,7 @@
<span style="font-weight: bolder" <span style="font-weight: bolder"
>总运费:<span style="color: #dc112a">{{ data?.totalAmount | currency }}</span></span >总运费:<span style="color: #dc112a">{{ data?.totalAmount | currency }}</span></span
> >
(运输费:{{ data?.totalFreight | currency }},附加费:{{ data?.totalSurcharge | currency }},附加费率:{{ data?.totalRate * 100 + '%' }} (运输费:{{ data?.totalFreight | currency }},附加费:{{ data?.totalSurcharge | currency }},附加费率:{{ (data?.totalRate * 100).toFixed(2) + '%' }}
</p> </p>
<p> <p>
<label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label> <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>