From b568ac9dd2f4483fea23d918edf301269c397118 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:08:34 +0800 Subject: [PATCH 01/13] edit --- .../driver-account/driver-account.component.ts | 2 +- .../freight-account/freight-account.component.ts | 2 +- .../abnormal-warning/abnormal-warning.component.ts | 2 +- .../order-management/components/bulk/bulk.component.ts | 2 +- .../compliance-audit/compliance-audit.component.ts | 2 +- .../receipts-audit/receipts-audit.component.ts | 2 +- .../order-management/components/risk/risk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../components/bulk/bulk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../invoice-detail/invoice-detail.component.html | 2 +- .../invoice-detail/invoice-detail.component.ts | 10 ++++++++++ .../ticket-management/services/ticket.service.ts | 2 ++ .../components/bulk/bulk.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- 15 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 9d0545cc..09830820 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 610f1efe..4fecfd91 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); } private initSF(): SFSchema { diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 68867622..a1a5dbf9 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -283,6 +283,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); } } diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 00a306fb..8aed0d9b 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -851,6 +851,6 @@ export class OrderManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams,this.service.$api_get_asyncExportBulkList); + this.service.exportStart(this.reqParams,this.service.$api_get_asyncExportBulkList); } } diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 5ae60cc3..386efae2 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -696,6 +696,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList); } } diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index a8b7fe1f..738f45fc 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -578,6 +578,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportExamineBillList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportExamineBillList); } } diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 14e690d7..c0591e1d 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -534,6 +534,6 @@ export class OrderManagementRiskComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportRiskBillList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportRiskBillList); } } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 58b2f93d..33976857 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -866,6 +866,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportWholeList); } } diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 14fddd9a..9e90a8f6 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -568,6 +568,6 @@ export class SupplyManagementBulkComponent implements OnInit { userAction() {} // 导出 exportFire() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportBulkList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList); } } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index c469dc82..e24a5a29 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -685,6 +685,6 @@ export class SupplyManagementVehicleComponent implements OnInit { } // 导出 exportFire() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList); } } diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 88dd0af1..32ca65f4 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -81,7 +81,7 @@
- +
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index ce250896..116357d8 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -107,6 +107,16 @@ export class InvoiceDetailComponent implements OnInit { } } + exportList() { + const params = { listSource: 1, pageSize: -1, vatinvHId: this.id }; + if (this.orderSf) { + Object.assign(params, { + ...this.orderSf.value + }); + } + this.service.exportStart(params, this.service.$api_export_invoice_order_detail); + } + private initOrderSF(): SFSchema { return { properties: { diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 23e50119..33bea9ba 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -73,6 +73,8 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get'; // 获取分票发票抬头开票申请订单明细 $api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId'; + // 货主/运营端获取开票申请订单明细导出 + $api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp'; // 获取分票发票抬头开票申请费用明细 $api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId'; // 获取分票发票明细 diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index cb6a8a74..e3b993be 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -480,6 +480,6 @@ export class WaybillManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams,this.service.$api_asyncExportBulkList) + this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList) } } diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 189a802a..eb87999f 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -489,6 +489,6 @@ export class WaybillManagementVehicleComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList); } } From 21d23b81006e4ed6de306fe7ef6eec511c4e2e8f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:10:00 +0800 Subject: [PATCH 02/13] edit --- .../etc-blacklist/etc-blacklist.component.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index ed60003b..413fe016 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -246,16 +246,16 @@ export class ETCBlacklistComponent implements OnInit { } } }, - params6: { - title: '手机号', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 2 - } - } - } + // params6: { + // title: '手机号', + // type: 'string', + // ui: { + // placeholder: '请输入', + // visibleIf: { + // tabType: (value: number) => this.tabType === 2 + // } + // } + // } } }; } From f2f4bd5066c9db6603be53182e6c3ee1824b0995 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:16:11 +0800 Subject: [PATCH 03/13] edit --- .../components/etc-blacklist/add-cart/add-cart.component.html | 4 ++-- .../etc-invoiced-list/etc-invoiced-list.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html index c2cae6ac..43a41742 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html @@ -1,8 +1,8 @@
-
+
-
+
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index e7bf1e89..56dc5ef8 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -95,7 +95,7 @@ export class ETCInvoicedListComponent implements OnInit { title: '订单类型', ui: { widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + params: { dictKey: 'bill:type' }, placeholder: '请选择' } }, From 1a397b28f3784626d03d059c3212b99b88675f4f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:24:31 +0800 Subject: [PATCH 04/13] edit --- .../etc-invoiced-requested.component.ts | 28 +++++++++---------- .../invoice-requested-detail.component.ts | 3 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 989fd892..f6ca7182 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -211,20 +211,20 @@ export class ETCInvoicedRequestedComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '运单号', index: 'wayBillCode' }, - { title: '订单号', index: 'billCode' }, - { title: '订单类型', index: 'billType' }, - { title: '装货地', index: 'loadingPlace' }, - { title: '卸货地', index: 'dischargePlace' }, - { title: '司机信息', render: 'call1No' }, - { title: '车辆信息', render: 'call1N2o' }, - { title: '托运人', index: 'shipperAppUserName' }, - { title: '网络货运人', index: 'enterpriseInfoName' }, - { title: '接单时间', index: 'orderReceivingTime', type: 'date' }, - { title: '装货时间', index: 'shipperAppUserName', type: 'date' }, - { title: '卸货时间', index: 'unloadingTime', type: 'date' }, - { title: '签收时间', index: 'submissionTime', type: 'date' } + { title: '', index: 'key', type: 'checkbox', width: '60px' }, + { title: '运单号', index: 'wayBillCode', width: '170px' }, + { title: '订单号', index: 'billCode' , width: '170px' }, + { title: '订单类型', index: 'billTypeLabel' , width: '140px' }, + { title: '装货地', index: 'loadingPlace' , width: '220px' }, + { title: '卸货地', index: 'dischargePlace', width: '220px' }, + { title: '司机信息', render: 'call1No', width: '140px' }, + { title: '车辆信息', render: 'call1N2o' , width: '200px' }, + { title: '托运人', index: 'shipperAppUserName' , width: '140px' }, + { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' }, + { title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' }, + { title: '装货时间', index: 'shipperAppUserName', type: 'date', width: '150px' }, + { title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px' }, + { title: '签收时间', index: 'submissionTime', type: 'date', width: '150px' } ]; } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 3453d2cb..401e2a10 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -189,6 +189,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { */ resetSF() { this.sf.reset(); + this._$expand = false; } /** @@ -267,7 +268,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } } }, - orderS22n2: { + drivercarinfo: { type: 'string', title: '车牌号', ui: { From a92677a5b9d2e1bc7018b768149257463782cc0b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 16:34:32 +0800 Subject: [PATCH 05/13] fix bug --- .../abnormal-warning.component.html | 4 +-- .../abnormal-warning.component.ts | 4 ++- .../order-reporting.component.ts | 4 +-- .../verify-result/verify-result.component.ts | 30 +++++++++++++++---- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html index 89c12502..9c9d31eb 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 10:11:15 + * @LastEditTime : 2022-04-08 16:34:26 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -70,7 +70,7 @@ -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
{{ item?.longitude }} diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 68867622..127f3ffb 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -227,7 +227,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { className: 'text-left', index: 'billCode' }, - { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left' }, + { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => { + return item?.resourceTypeLabel + item?.serviceTypeLabel + } }, { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, 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 3ea3973e..9767948c 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 @@ -177,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { } }, checkStatus: { - title: '精准', + title: '本地校验', type: 'string', ui: { placeholder: '请选择', @@ -241,7 +241,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', }, - { title: '精准', render: 'checkStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, { title: '订单号', index: 'billCode', diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts index de01a2c0..f82336a2 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 14:26:01 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 15:36:04 + * @LastEditTime : 2022-04-08 15:48:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -63,11 +63,29 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit { initST() { this.columns = [ { title: '序号', type: 'no', className: 'text-center', width: '60px', }, - { title: '校验字段', index: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', }, - { title: '上传值', index: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', }, - { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + { title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', }, + { + title: '是否必填', + index: 'requiredStatus', + className: 'text-center', + width: '100px', + type: 'enum', + enum: { + 0: '否', + 1: '是' + } + }, + { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', }, + { + title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px', + type: 'enum', + enum: { + 0: '校验中', + 1: '通过', + 2: '不通过' + } + }, + { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', }, ] } From b0c9165b660be9c39440c6abd0acbc52664bbb78 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 16:39:59 +0800 Subject: [PATCH 06/13] fix bug --- .../etc-invoiced-requested.component.html | 2 +- .../etc-invoiced-requested.component.ts | 4 ++++ .../routes/ticket-management/services/ticket.service.ts | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index 774444c3..5c72a373 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -12,7 +12,7 @@ class="text-right"> - + - - - -
+
+
+
+
+ + + + +
+
- - - {{ (parseFloat(item.availableBalance) + - parseFloat(item.freezeBalance)).toFixed(2) | currency}} - - - \ No newline at end of file + + + {{ + (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency + }} + + + diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 09830820..99daad10 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -18,7 +18,7 @@ export class DriverAccountComponent implements OnInit { st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - + loading: boolean = true; searchSchema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); _$expand = false; @@ -40,9 +40,16 @@ export class DriverAccountComponent implements OnInit { }); } } + this.loading = true; return requestOptions; }; - + afterRes = (data: any[], rawData?: any) => { + console.log(data) + this.loading = false + return data.map(item => ({ + ...item, + })); + }; showAccountDetail(item: any) { this.modal.create({ nzTitle: '账户明细', From 9ce58b394fa716e5fc09abc9f9176cef75b87751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 17:17:04 +0800 Subject: [PATCH 11/13] - --- .../components/order-reporting/order-reporting.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 52d5bad7..1d8a4f94 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 @@ -46,7 +46,7 @@ - {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} {{filterCheckStatus(item?.checkStatus)}} From ab9810d80b19b69f0e7f52a01c9a2161a9ea6f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 17:24:39 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=BD=A6=E7=89=8C=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/fund-reporting/fund-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa7ecd77..4dbd6634 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 @@ -248,7 +248,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' }, { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' }, { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' }, - { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, + { title: '车牌颜色', index: 'carColorLabel', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' }, From 769f660e3a7f9571a4a35b057288fe710dcc5308 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 17:40:35 +0800 Subject: [PATCH 13/13] fix bug --- .../driver-account-detail.component.ts | 2 +- .../freight-account-detail.component.ts | 2 +- .../freight-account.component.ts | 2 +- .../platform-account-detail.component.ts | 2 +- .../platform-account.component.html | 2 +- .../platform-account.component.ts | 3 +++ .../recharge-record.component.ts | 2 +- .../transaction-flow.component.html | 2 +- .../transaction-flow.component.ts | 3 +++ .../services/freight-account.service.ts | 19 ++++++++++++++++++- 10 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 7b27f0bc..f95f59d1 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 410c7fac..bb1b21f9 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 4fecfd91..5abfbe19 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index ed00c9f4..20acc782 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index 0cda0ad8..e1928689 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -46,7 +46,7 @@
- +
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 87b42163..b69a5245 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -194,4 +194,7 @@ export class PlatformAccountComponent implements OnInit { } ]; } + exportList() { + this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 }); + } } diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index e45f63bb..01927beb 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 }); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index 77fc9628..bd7fb2aa 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -11,7 +11,7 @@ class="text-right"> - +