diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index abc0a682..734c6771 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -691,9 +691,11 @@ export class OrderManagementBulkComponent implements OnInit {
nzComponentParams: { data: { ...data, billId: item.id } },
nzFooter: null
});
- modal.afterClose.subscribe(_ => {
+ modal.afterClose.subscribe((res: any) => {
+ if(res) {
this.st.reload(1);
this.getGoodsSourceStatistical();
+ }
});
}
});
@@ -778,13 +780,16 @@ export class OrderManagementBulkComponent implements OnInit {
nzTitle: '申请退款',
nzContent: OneCarOrderCancelConfirmComponent,
nzComponentParams: {
- i: item
+ i: item,
+ sts: 1
},
nzFooter: null
});
- modalRef.afterClose.subscribe(() => {
- this.resetSF;
- this.st.load();
+ modalRef.afterClose.subscribe((res: boolean) => {
+ if(res) {
+ this.resetSF;
+ this.st.load();
+ }
});
}
}
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 f2401ae1..09e49f8c 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -656,20 +656,12 @@ resourceStatus: any;
nzContent: VehicleUpdateFreightComponent,
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 => {
- // if (res) {
- // this.service.msgSrv.success('变更运费成功');
- // modal.destroy();
- // this.st.reload();
- // }
- // });
- // return false;
- // }
});
- modal.afterClose.subscribe(_ => {
- this.st.load();
- this.getGoodsSourceStatistical()
+ modal.afterClose.subscribe((res: Boolean) => {
+ if(res) {
+ this.st.load();
+ this.getGoodsSourceStatistical()
+ }
});
}
});
@@ -850,13 +842,16 @@ resourceStatus: any;
nzTitle: '申请退款',
nzContent: OneCarOrderCancelConfirmComponent,
nzComponentParams: {
- i: item
+ i: item,
+ sts: 2
},
nzFooter: null
});
- modalRef.afterClose.subscribe(() => {
- this.resetSF;
- this.st.load();
+ modalRef.afterClose.subscribe((res: boolean) => {
+ if(res) {
+ this.resetSF;
+ this.st.load();
+ }
});
}
}
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 af73040f..281184cf 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-01-24 17:04:28
+ * @LastEditTime : 2022-02-22 15:44:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -213,6 +213,6 @@ export class UpdateFreightComponent implements OnInit {
}
close(): void {
- this.modal.destroy();
+ this.modal.destroy(false);
}
}
diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
index e8e7f5c8..681de039 100644
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
@@ -31,6 +31,6 @@