From 1a5a6473c7da8aab93d84c78028e946148d6a2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Tue, 12 Apr 2022 13:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fund-reporting.component.html               |  4 ++--
 .../fund-reporting/fund-reporting.component.ts  | 17 +++++++++++++++++
 .../order-reporting.component.ts                | 10 ++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
index 32f56a3b..d48b1b26 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@@ -37,10 +37,10 @@
       <span *ngIf="item?.verifyStatus === '1'">{{item?.verifyStatusLabel}}</span>
     </ng-template>
     <ng-template st-row="orderCode" let-item>
-      <span class="text-blue-dark">{{item?.orderCode}}</span>
+      <a (click)="routeToOrder(item)">{{item?.orderCode}}</a>
     </ng-template>
     <ng-template st-row="wayBillCode" let-item>
-      <span class="text-blue-dark">{{item?.wayBillCode}}</span>
+      <a (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
     </ng-template>
     <ng-template st-row="tolalAmount" let-item let-index="index">
       <div class="text-right">{{item?.tolalAmount | currency }}</div>
diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
index 1b75e714..d73b3fb2 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@@ -465,6 +465,23 @@ export class DatatableFundReportingComponent implements OnInit {
     }
   }
 
+  routeToOrder(item: any) {
+    if (item.orderType === '1') {
+      window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
+    } else {
+      window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
+    }
+  }
+
+  routeTowaybill(item: any) {
+    if (item.orderType === '1') {
+      window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
+
+    } else {
+      window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
+
+    }
+  }
 
 
 }
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 69d0bf0f..0de0aa39 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
@@ -596,17 +596,19 @@ export class DatatableOrderReportingComponent implements OnInit {
 
   routeToOrder(item: any) {
     if (item.billType === '1') {
-      this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.orderId]);
+      window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
     } else {
-      this.router.navigate(['/order-management/bulk/bulk-detail/' + item.orderId]);
+      window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
     }
   }
 
   routeTowaybill(item: any) {
     if (item.billType === '1') {
-      this.router.navigate(['/waybill-management/vehicle/vehicle-detail/' + item.waybillId]);
+      window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
+
     } else {
-      this.router.navigate(['/waybill-management/bulk/bulk-detail/' + item.waybillId]);
+      window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
+
     }
   }