Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-14 17:44:00 +08:00
parent ffaf43a9ee b4c2b2dc85
commit fa3794437d
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
View File

@ -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);
}
}

2
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -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) => {