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

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>

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}`);
+
+    }
+  }
 
 
 }

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html

@@ -49,10 +49,10 @@
     </ng-template>
 
     <ng-template st-row="billCode" let-item>
-      <span class="text-red-dark">{{item?.billCode}}</span>
+      <a class="text-red-dark" (click)="routeToOrder(item)">{{item?.billCode}}</a>
     </ng-template>
     <ng-template st-row="wayBillCode" let-item>
-      <span class="text-red-dark">{{item?.wayBillCode}}</span>
+      <a class="text-red-dark" (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
     </ng-template>
 
     <ng-template st-row="freightAmount" let-item let-index="index">

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -594,4 +594,22 @@ export class DatatableOrderReportingComponent implements OnInit {
     }
   }
 
+  routeToOrder(item: any) {
+    if (item.billType === '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.billType === '1') {
+      window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
+
+    } else {
+      window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
+
+    }
+  }
+
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -52,7 +52,7 @@ export class OrderManagementService extends ShipperBaseService {
   //  订单申请撤销
   $api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`;
   //  运费变更申请-整车
-  $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`;
+  $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertOperateFreightChangeWhole`;
   //  取消订单
   $api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`;
   //  批量签收整车订单
@@ -92,7 +92,7 @@ export class OrderManagementService extends ShipperBaseService {
   //运费变更申请计算费用-整车
   $api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`;
   //运费变更申请-大宗
-  $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
+  $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertOperateFreightChangeBulk`;
   // 删除装卸货信息
   $api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`;
   // 修改-大宗订单

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -499,5 +499,4 @@ export class TaxManagementOrderReportingComponent implements OnInit {
     })
   }
 
-
 }