解决冲突
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-15 13:17:42 | ||||
|  * @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 | ||||
|  * 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) => { | ||||
|       if (res) { | ||||
|         Object.assign(this.data, { | ||||
|           totalAmount: res.totalAmount, | ||||
|           totalFreight: res.totalFreight, | ||||
|           freight: res.freight, | ||||
|           surcharge: res.surcharge | ||||
|  | ||||
		Reference in New Issue
	
	Block a user