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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 14:26:30 +08:00
parent 6ff6a7d2bb
commit b868555ef4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-14 14:03:07 * @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-21 14:44:38 * @LastEditTime : 2022-02-23 14:20:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->

2
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-14 14:03:07 * @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-22 15:44:05 * @LastEditTime : 2022-02-23 14:23:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

3
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
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:01 * @LastEditTime : 2022-02-23 14:25:45
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -152,6 +152,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
this.calculateSub = this.service.request(this.service.$api_getWholeSurchargeDetail, this.getParams()).subscribe((res: any) => { this.calculateSub = this.service.request(this.service.$api_getWholeSurchargeDetail, this.getParams()).subscribe((res: any) => {
if (res) { if (res) {
Object.assign(this.data, { Object.assign(this.data, {
totalAmount: res.totalAmount,
totalFreight: res.totalFreight, totalFreight: res.totalFreight,
freight: res.freight, freight: res.freight,
surcharge: res.surcharge surcharge: res.surcharge