diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index bee8f2fc..442fda26 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -77,7 +77,7 @@ {{openInfo?.isdetail?'需要':'不需要'}} - {{openInfo?.vatnotax | currency}} + {{openInfo?.vatmoney | currency}} diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index afc5e4d0..d45bd8eb 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -123,7 +123,7 @@ export class InputInvoiceComponent implements OnInit { title: '发票类型', ui: { widget: 'dict-select', - params: { dictKey: 'DictConstants.INVOICE_TYPE' }, + params: { dictKey: 'invoice:type' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 73345fc2..309567b0 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -406,6 +406,7 @@ export class InvoiceRequestedComponent { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '申请编号', render: 'vatappcode', width: 190 }, + { title: '发票类型', index: 'vatapptypeLable', width: 140 }, { title: '网络货运人', index: 'ltdName', width: 170 }, { title: '货主名称', index: 'artoName', width: 170 }, { title: '订单数', index: 'ordlines', width: 90 }, @@ -444,6 +445,7 @@ export class InvoiceRequestedComponent { params: ({ record }) => ({ value: record.invoicedMoney }) } }, + { title: '已开票张数', index: 'invoicedNum', width: 160 }, { title: '开户行', index: 'bankName', width: 160 }, { title: '银行账户', index: 'bankAccount', width: 140 }, { title: '注册地址', index: 'registerAddr', width: 140 }, @@ -463,7 +465,7 @@ export class InvoiceRequestedComponent { { title: '快递是否下单成功', index: 'expressHSts', - width: 150, + width: 170, className: 'text-center', type: 'enum', enum: { true: '是', false: '否' } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 932f19c9..64f392be 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -75,7 +75,7 @@ export class TicketService extends ShipperBaseService { // 获取分票发票明细 $api_get_invoice_details = '/api/fcc/ficoVatinvL/getDetailByVatinvHId'; // 运营端订单明细开票处理 - $api_get_applyFicoVatinv = '/api/fcc/ficoVatinvH/applyFicoVatinv'; + $api_get_applyFicoVatinv = '/api/fcc/ficoVatinvH/applyBatchFicoVatinv'; // 开票申请列表批量开票 $api_get_applyBatchFicoVatinv = '/api/fcc/ficoVatinvH/applyBatchFicoVatinv'; // 删除销项发票抬头