From 7e50c5c770dbe2dd976ddf1bcc2dda37f58c0410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 14 Apr 2022 17:05:47 +0800 Subject: [PATCH 1/2] - --- .../verify-result/verify-result.component.ts | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 0ae727c7..cd63765c 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -91,14 +91,26 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } update() { - if (this.record?.billType === '1') { - window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`) - - } else if (this.record.billType === '2') { - window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`); + switch (this?.subjectType) { + case 2: + this.openNewPage(`/usercenter/driver/detail/${this.record?.driverId}`); + break; + case 3: + if (this.record?.billType === '1') { + this.openNewPage(`/order-management/vehicle-detailChange/${this.record?.orderId}`); + } else if (this.record.billType === '2') { + this.openNewPage(`/order-management/bulk-detailChange/${this.record?.orderId}`); + } + break; + case 4: + this.openNewPage(`/vehicle/list/detail/${this.record?.carId}`); + break; + default: + break; } + } @@ -119,4 +131,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } } + openNewPage(url: string) { + window.open(location.origin + `/#` + url); + } + } From c459a3905357a73a7624535c0dec29aa469d9f30 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 17:06:00 +0800 Subject: [PATCH 2/2] fix bug --- .../individual-collect/individual-collect.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index ed4066bb..8876c702 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -282,7 +282,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { */ upload() { if (this.selectedRows.length === 0) { - this.service.msgSrv.warning('请选择需要上传的数据'); + this.service.msgSrv.warning('请选择需要申报的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {