From ddd3b7167b4ecee1b453eef04e13edd9ba0f44d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Sat, 2 Apr 2022 17:59:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/order-reporting/order-reporting.component.ts | 6 ++++-- .../datatable/reporting/services/reporting.service.ts | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 43cc4b2a..54ab6360 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -352,7 +352,8 @@ export class DatatableOrderReportingComponent implements OnInit { nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + const ids = this.selectedRows.map(i => i?.id); + this.service.request(this.service.$api_recall_order_reporting, ids).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -409,7 +410,8 @@ export class DatatableOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要上传的数据'); return; } - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + const ids = this.selectedRows.map(i => i?.id); + this.service.request(this.service.$api_upload_order_reporting, ids).subscribe((res: any) => { if (res) { this.service.msgSrv.success('上传成功'); this.search(); diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index d01c6812..1cf31e76 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -7,7 +7,8 @@ import { BaseService } from '@shared'; export class ReportingService extends BaseService { $api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表 - $api_recall_reporting = ``; // 撤回 + $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报 + $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置 $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置