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

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') {
+    switch (this?.subjectType) {
-      window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
+      case 2:
-
+        this.openNewPage(`/usercenter/driver/detail/${this.record?.driverId}`);
-    } else if (this.record.billType === '2') {
+        break;
-      window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
+      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);
+  }
+
 }

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