diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html index 425e1621..b6803fd0 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-02-23 14:20:32 + * @LastEditTime : 2022-03-01 19:27:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -19,6 +19,7 @@ [ngModel]="i.value" (ngModelChange)="i.setValue($event)" placeholder="请输入" + (change)="changeNumVal()" oninput="if(value>99999)value=99999;if(value<0)value=0" /> diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 8c89214c..9ee9df5e 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-02-23 14:23:26 + * @LastEditTime : 2022-03-01 19:27:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -50,7 +50,6 @@ export class UpdateFreightComponent implements OnInit { placeholder: '请输入', widget: 'custom', grid: { span: 12 }, - change: (val: any) => this.changeNumVal() } as SFStringWidgetSchema, default: data.freightPrice }, @@ -181,18 +180,19 @@ export class UpdateFreightComponent implements OnInit { } changeNumVal() { + console.log('444') if (this.calculateSub) { this.calculateSub.unsubscribe(); } const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} } this.calculateSub = this.service .request(this.service.$api_calculate_cost, params) - .subscribe((res: any) => { + .subscribe(res => { if (res) { Object.assign(this.data, { + totalAmount: res.totalAmount, totalFreight: res.totalFreight, - freight: res.freight, - surcharge: res.surcharge + totalSurcharge: res.totalSurcharge }); } }); diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index d142db1c..b426ad03 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 12:01:42 + * @LastEditTime : 2022-03-01 19:21:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */