diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index bc0c5c7b..ed91bd00 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -11,6 +11,26 @@ + + + + + + + + + + + + + + + + +
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 64c951c6..f5fac6ee 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -23,6 +23,7 @@ export class PayableOrderComponent implements OnInit { _$expand = false; selectedRows: any[] = []; + info: any = {}; constructor( public service: FreightAccountService, private nzModalService: NzModalService, @@ -30,7 +31,16 @@ export class PayableOrderComponent implements OnInit { private currencyPipe: CurrencyPipe ) {} - ngOnInit(): void {} + ngOnInit(): void { + } + + loadInfo() { + this.service.request(this.service.$api_get_fico_ph_sum).subscribe(res => { + if (res) { + this.info = res; + } + }); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -54,6 +64,7 @@ export class PayableOrderComponent implements OnInit { }); } } + this.loadInfo(); return requestOptions; }; diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 63041216..0755a3f3 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -10,6 +10,26 @@ --> + + + + + + + + + + + + + + + + +
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 3732bc49..38da87bb 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -24,6 +24,8 @@ export class ReceivableOrderComponent implements OnInit { _$expand = false; selectedRows: any[] = []; + + info: any = {}; constructor( public service: FreightAccountService, private nzModalService: NzModalService, @@ -31,7 +33,16 @@ export class ReceivableOrderComponent implements OnInit { private currencyPipe: CurrencyPipe ) {} - ngOnInit(): void {} + ngOnInit(): void { + } + + loadInfo() { + this.service.request(this.service.$api_get_fico_sum).subscribe(res => { + if (res) { + this.info = res; + } + }); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -55,6 +66,7 @@ export class ReceivableOrderComponent implements OnInit { }); } } + this.loadInfo(); return requestOptions; }; @@ -260,23 +272,23 @@ export class ReceivableOrderComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 }, - { title: '订单号', index: 'billHCode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdName', width: 160 }, + { title: '核销单号', index: 'ahxcode', type: 'link', width: 210 }, + { title: '订单号', index: 'billHCode', type: 'link', width: 180 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, - { title: '收款账户', index: 'ltdaccountId', width: 160 }, + { title: '收款账户', index: 'ltdaccountId', width: 200 }, { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 }, { title: '核销金额', index: 'ahxmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.ahxmoney)}` }, { title: '应收金额', index: 'armoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.armoney)}` }, diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 21879053..a149cb77 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -88,6 +88,8 @@ export class FreightAccountService extends ShipperBaseService { // 查询应收核销抬头 $api_get_fico_page = '/api/fcc/ficoAhxH/list/page'; + // 应收核销汇总 + $api_get_fico_sum = '/api/fcc/ficoAhxH/getSum'; // 获取应收核销抬头 $api_get_fico_header = '/api/fcc/ficoAhxH/get'; // 查询应收核销明细 @@ -95,6 +97,8 @@ export class FreightAccountService extends ShipperBaseService { // 查询应付核销抬头 $api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page'; + // 应付核销汇总 + $api_get_fico_ph_sum = '/api/fcc/ficoPhxH/getSum'; // 获取应付核销抬头 $api_get_fico_ph_header = '/api/fcc/ficoPhxH/get'; // 查询应付核销明细