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 @@ {{item?.verifyStatusLabel}} - {{item?.orderCode}} + {{item?.orderCode}} - {{item?.wayBillCode}} + {{item?.wayBillCode}}
{{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.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index df751a97..be7285cc 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -49,10 +49,10 @@ - {{item?.billCode}} + {{item?.billCode}} - {{item?.wayBillCode}} + {{item?.wayBillCode}} 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 af13dbb0..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 @@ -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}`); + + } + } + } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 607a26a9..364b7cae 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/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`; // 修改-大宗订单 @@ -197,13 +197,13 @@ export class OrderManagementService extends ShipperBaseService { // 异步导出风险单导出 $api_get_asyncExportRiskBillList = `/api/sdc/billRiskOperate/asyncExportRiskBillList`; // 异步导出合规抽查导出 - $api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; + $api_get_asyncExportSpotCheckList = `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; // 异步导出单据审核导出 - $api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`; + $api_get_asyncExportExamineBillList = `/api/sdc/billExamine/asyncExportExamineBillList`; // 异步导出单据审核导出 - $api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`; + $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`; // 异步导出投诉管理导出 - $api_asyncExportComplaintListDrv= `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; + $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index e11afb2a..2cf91aeb 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -119,7 +119,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { searchLoadingText: '搜索中...', allowClear: true, onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q.replace(/^\s+|\s+$/g, ""); if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) @@ -129,7 +129,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { return of([]); } }, - + } as SFSelectWidgetSchema }, driverName: { @@ -262,7 +262,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, - { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, + { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' }, @@ -308,7 +308,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -371,7 +371,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { selectChange(item: any) { console.log(item); - + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(); @@ -499,5 +499,4 @@ export class TaxManagementOrderReportingComponent implements OnInit { }) } - }