diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 06710506..5d08faa3 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -640,13 +640,14 @@ resourceStatus: any; *变更运费 */ updateFreight(item: any) { + console.log(item?.isFreightChangeApplication) this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => { if (data) { const modal = this.modal.create({ nzTitle: '变更运费', nzWidth: 580, nzContent: VehicleUpdateFreightComponent, - nzComponentParams: { data: { ...data, id: item.id } }, + nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } }, nzFooter: null, // nzOnOk: sin => { // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 6d08fc39..cd1d3b49 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -25,5 +25,5 @@
diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index 60ed2901..85db19ad 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-14 09:34:18 + * @LastEditTime : 2022-02-21 14:16:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -26,6 +26,7 @@ export class VehicleUpdateFreightComponent implements OnInit { ui: SFUISchema = {}; aggreechecked = false; + payIng = true; @Input() data: any; @@ -37,6 +38,11 @@ export class VehicleUpdateFreightComponent implements OnInit { ngOnInit(): void { console.log(this.data) this.initSF(this.data); + if(this.data.isFreightChangeApplication) { + this.payIng = false; + } else { + this.payIng = true; + } } initSF(data: any) { const info = { diff --git a/src/app/routes/supply-management/components/index/index.component.html b/src/app/routes/supply-management/components/index/index.component.html index 70f2cdab..56ba2fbb 100644 --- a/src/app/routes/supply-management/components/index/index.component.html +++ b/src/app/routes/supply-management/components/index/index.component.html @@ -1,18 +1,15 @@ +