Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-10 10:38:12 +08:00
parent 18b1c0da61
commit 1162a54f3a
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -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-01-20 19:07:55 * @LastEditTime : 2022-02-10 10:30:22
* @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.
--> -->
@ -142,8 +142,9 @@
</st> </st>
<div> <div>
<div> <div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费￥{{ 总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
totalObj?.price - attObj?.price | currency}}，附加费￥{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%） （运费{{i?.totalFreight | currency}}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
</div> </div>
</div> </div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div> <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>

8
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -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:13 * @LastEditTime : 2022-02-10 10:30:23
* @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.
--> -->
@ -130,9 +130,9 @@
<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 }"> </st>
<div> <div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> 总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
（运费{{totalObj?.price - attObj?.price | currency}}， （运费{{i?.totalFreight | currency}}，
附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%） 附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
</div> </div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div> <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card> </nz-card>

4
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
View File

@ -4,11 +4,11 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-29 14:51:07 * @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:25 * @LastEditTime : 2022-02-10 10:19:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert> <nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf> <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer"> <div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button> <button nz-button type="button" (click)="close()">关闭</button>

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -233,7 +233,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
} }
} }
}, },
contactName2: { name: {
title: '管理员', title: '管理员',
type: 'string', type: 'string',
ui: { ui: {