From 44ca28dd4c108118e1a4735c477409cb7d67422c Mon Sep 17 00:00:00 2001 From: heqinghang Date: Wed, 30 Mar 2022 16:32:29 +0800 Subject: [PATCH] 666 --- .../invoicetable/invoicetable.component.html | 19 +++++++- .../invoicetable/invoicetable.component.ts | 45 ++++++++++--------- .../routes/datatable/services/data.service.ts | 3 ++ 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html index 13411ab5..1495916b 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -3,12 +3,27 @@ + + {{item.totalInvoicedAmount | currency}} + + + {{item.invAmountMonth | currency}} + + + {{item.applyWaitInvAmount | currency}} + + + {{item.unInvoicedAmountHistory | currency}} + + + {{item.unInvoicedAmountCurMonth | currency}} + diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts index 9916e4c4..fd61e55f 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; +import { DataService } from '../../services/data.service'; @Component({ selector: 'app-datatable-invoicetable', @@ -13,7 +14,7 @@ export class DatatableInvoicetableComponent implements OnInit { columns!: STColumn[]; data=[{name1:1111}] - constructor(private http: _HttpClient, private modal: ModalHelper) { } + constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { } /** * 查询参数 @@ -23,48 +24,48 @@ export class DatatableInvoicetableComponent implements OnInit { } ngOnInit(): void { this.initST(); + } initST() { this.columns = [ { title: '运营主体', - index: 'name1' + index: 'operationName' }, { title: '已开票总金额', - index: 'name1' + index: 'totalInvoicedAmount', + render: 'totalInvoicedAmount', }, { title: '当月已开票金额', - index: 'name1' + index: 'invAmountMonth', + render: 'invAmountMonth', + }, + { + title: '当月已开票张数', + index: 'numInvAmountMonth', }, { title: '已申请待开金额', - index: 'name1' + index: 'applyWaitInvAmount', + render: 'applyWaitInvAmount', + }, + { + title: '申请待开客户', + index: 'applyWaitCustomer', }, { title: '未申请开票金额(历史)', - index: 'name1' + index: 'unInvoicedAmountHistory', + render: 'unInvoicedAmountHistory', }, { title: '未申请开票金额(当月)', - index: 'name1' + index: 'unInvoicedAmountCurMonth', + render: 'unInvoicedAmountCurMonth', }, - { - title: '当月发票张数', - index: 'name1' - }, - { - title: '剩余发票张数', - index: 'name1' - }, - ]; } - add(): void { - // this.modal - // .createStatic(FormEditComponent, { i: { id: 0 } }) - // .subscribe(() => this.st.reload()); - } } diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index be36c9cf..4522bacd 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -24,6 +24,9 @@ export class DataService extends BaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; + // 查询开票数据报表 + $api_findInvoiceReport = `/api/fcc/invoiceReport/findInvoiceReport`; + constructor(public injector: Injector) { super(injector); }