diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html index abcdca2d..f05f5d79 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html @@ -27,7 +27,7 @@ {{ costInfo?.ltdaccountId }} - {{ costInfo?.premoney |currency }} + {{ costInfo?.brmmoney |currency }} {{ costInfo?.brmtypeLabel }} diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 527501d6..0f070c54 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -282,7 +282,7 @@ export class PaymentRecordComponent implements OnInit { { title: '申请人', index: 'applyUserName', width: 90 }, { title: '处理时间', index: 'handlerTime', width: 180 }, { title: '处理人', index: 'handlerUserName', width: 90 }, - { title: '失败原因', index: 'failCause', width: 250 }, + { title: '备注', index: 'failCause', width: 250 }, { title: '操作', fixed: 'right', diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index f98fed03..0bebf2f9 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -265,7 +265,7 @@ export class WithdrawalsRecordComponent implements OnInit { { title: '提现状态', index: 'refundStatusLabel', width: 100 }, { title: '银行流水号', index: 'bankSerialNumber', width: 120 }, { title: '核心交易流水', index: 'coreSerNo', width: 130 }, - { title: '失败原因', index: 'rejectionCause', width: 150, format: item => item.failCause || item.rejectionCause }, + { title: '备注', index: 'rejectionCause', width: 150, format: item => item.failCause || item.rejectionCause }, { title: '操作', fixed: 'right', 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 27be3997..9a806f63 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 @@ -50,9 +50,7 @@ (change)="stChange($event)"> {{ item.vatinvcode }}
- - - +
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 94130c83..3e9c7854 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -342,13 +342,13 @@ export class CancellationInvoiceComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } }, - { - title: '税率', - index: 'billvatrate', - width: 120, - className: 'text-right', - format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` - }, + // { + // title: '税率', + // index: 'billvatrate', + // width: 120, + // className: 'text-right', + // format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` + // }, { title: '税额', index: 'vattax', @@ -372,7 +372,7 @@ export class CancellationInvoiceComponent implements OnInit { text: '查看明细', click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { - queryParams: { type: 1, expressno: item.expressno } + queryParams: { type: 1, expressno: item.expressno, ltdId: item.ltdId } }) }, { 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 86afcd02..1ae799ba 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 @@ -38,12 +38,14 @@ export class InvoiceDetailComponent implements OnInit { routes: [] }; id: any = null; + ltdId: any = null; type: any = 1; constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = !!route.snapshot.queryParams.type; const expressno = route.snapshot.queryParams.expressno; this.type = route.snapshot.queryParams.type; this.id = route.snapshot.params.id; + this.ltdId = route.snapshot.queryParams.ltdId; this.loadInvoiceHeader(this.id); if (expressno) { this.loadRoutes(expressno); @@ -130,7 +132,12 @@ export class InvoiceDetailComponent implements OnInit { projectId: { type: 'string', title: '所属项目', - ui: { widget: 'select', placeholder: '请选择', allowClear: true, asyncData: () => this.service.getEnterpriseProject() }, + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getEnterpriseProject({ id: this.ltdId }) + }, default: '' } } @@ -147,6 +154,13 @@ export class InvoiceDetailComponent implements OnInit { { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 140 }, { title: '承运司机', index: 'driverinfo', width: 280 }, + { + title: '税额', + index: 'billvatrate', + width: 120, + className: 'text-right', + format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` + }, { title: '申请金额', index: 'billkpnotax', diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 34c6d849..71c1c95e 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -56,15 +56,24 @@ export class InvoicedListComponent implements OnInit { } } - deletedInvoice() { - if (this.selectedRows?.length <= 0) { - this.service.msgSrv.warning('请选择发票'); - return; - } - this.nzModalService.warning({ + deletedInvoice(item: any) { + // if (this.selectedRows?.length <= 0) { + // this.service.msgSrv.warning('请选择发票'); + // return; + // } + const modal = this.nzModalService.warning({ nzTitle: '确定将所选发票作废?', nzCancelText: '取消', - nzOnOk: () => {} + nzOnOk: () => { + this.service.request(this.service.$api_cancel_invoice, { id: item.id }).subscribe(res => { + if (res) { + this.service.msgSrv.success('发票作废成功'); + } + modal.destroy(); + this.st.load(1); + }); + return false; + } }); } @@ -240,9 +249,14 @@ export class InvoicedListComponent implements OnInit { text: '查看明细', click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { - queryParams: { expressno: item.expressno, type: 2 } + queryParams: { expressno: item.expressno, type: 2, ltdId: item.ltdId } }) }, + { + text: '发票作废', + click: item => this.deletedInvoice(item), + iif: item => item.sts === '1' + }, { text: '查看物流', click: item => this.showlogosticsLogs(item), diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 690eea09..71facc39 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -52,6 +52,9 @@ export class TicketService extends ShipperBaseService { // 已开发票查询 $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page'; + + // 发票作废 + $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel'; // 获取销项发票抬头 $api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get'; // 获取分票发票抬头开票申请订单明细 diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index 78cec574..9c57ea4b 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -1,5 +1,5 @@ - +