From 599fe261f2240c439bf7a6368a157b311d18372b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 31 Mar 2022 17:36:50 +0800 Subject: [PATCH] fix bug --- .../components/receipts-audit/receipts-audit.component.ts | 8 ++++---- .../components/vehicle/vehicle.component.ts | 6 ++++++ .../vehicle/confir-receipt/confir-receipt.component.ts | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 1ee4249a..a5228fed 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -532,13 +532,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } // 批量生成电子单据 sign1(item?: any) { - if (this.selectedRows.length <= 0) { + if (this.selectedRows?.length <= 0) { this.service.msgSrv.error('请选择订单!') return } let params: any[] = []; this.selectedRows.forEach(item => { - params.push(item.id); + params.push(item?.id); }); this.modal.confirm({ nzTitle: `已选择${this.selectedRows.length}条订单,确认批量生成电子单据吗?`, @@ -555,10 +555,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { // this.getGoodsSourceStatistical(); // }) { - this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params}) + this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params.join(',')}) - this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})} + this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params.join(',')})} }); } 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 37d2336c..55002520 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -761,6 +761,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme }, nzFooter: null }); + modalRef.afterClose.subscribe((res: boolean) => { + if (res) { + this.resetSF; + this.st.load(); + } + }); } revoke(item: any) { this.modal.confirm({ diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts index e20e427b..fa5b8958 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-03-31 14:21:48 + * @LastEditTime : 2022-03-31 17:36:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -74,7 +74,7 @@ export class VehicleConfirReceiptComponent implements OnInit { console.log(res); if (res) { this.service.msgSrv.success('确认签收成功!'); - this.modal.destroy(); + this.modal.destroy(true); } }); }