From 229b6d68b8026c4e16791e92058cd49768faee2c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 15:40:24 +0800 Subject: [PATCH 1/7] edit --- .../etc-invoiced-logs/etc-invoiced-logs.component.html | 2 +- .../etc-invoiced-logs/etc-invoiced-logs.component.ts | 10 ++++++++++ .../etc-invoiced-requested.component.ts | 2 +- .../ticket-management/services/ticket.service.ts | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html index 970fa449..9384773b 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html @@ -13,7 +13,7 @@ class="text-right"> - + + diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 615ed34d..6c411bc0 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -39,11 +39,11 @@ export class RequestedInvoiceModalComponent { removeOrder(item: any[]) { console.log(item); this.nzModalService.warning({ - nzTitle: '确定从当前批次中移除所有订单？', + nzTitle: '确定从当前批次中移除所选订单？', nzContent: '移除后相关订单可以重新提交开票申请', nzOnOk: () => { - const ids = this.selectedRows.map(order => order.billHId); - this.service.request(this.service.$api_remove_bill, ids).subscribe(res => { + const ids = item.map(order => order.billHId); + this.service.request(this.service.$api_remove_bill, { billHIds: ids }).subscribe(res => { if (res) { this.service.msgSrv.success('移除成功'); this.modal.destroy(true); diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 0ac4b819..23e50119 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -22,7 +22,8 @@ export class TicketService extends ShipperBaseService { // 货主/运营端获取开票申请订单明细 $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; // 删除开票申请订单明细 - $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + // $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + $api_remove_bill = '/api/fcc/ficoVatappH/remove'; // 运营端单个/批量驳回 $api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple'; // 运营端修改开票地址 From b568ac9dd2f4483fea23d918edf301269c397118 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 16:08:34 +0800 Subject: [PATCH 4/7] 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 5/7] 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 6/7] 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 7/7] 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: {