{{item?.tolalAmount | currency }}
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}`);
+
}
}