diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html index 8af9b874..c82496bd 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.html +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -1,3 +1,13 @@ + @@ -45,6 +55,15 @@ {{item.dkpje | currency}} + + {{item.yingsfjf | currency}} + + + {{item.yisfjf | currency}} + + + {{item.fjfl + '%'}} + diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index 6a109564..ef318c6b 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -34,17 +34,17 @@ export class DatatableFinancetableComponent implements OnInit { chartData: any = {} flag = false; columns: STColumn[] = [ - { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, - { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center' }, - { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' }, - { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center' }, - { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' }, - { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' }, - { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' }, - { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' }, - { title: '应收附加费', index: 'yingsfjf', className: 'text-center' }, - { title: '已收附加费', index: 'yisfjf', className: 'text-center' }, - { title: '平均附加费率', index: 'fjfl', className: 'text-center' } + { title: '运营主体', index: 'networkTransporterName', className: 'text-center' ,width: 200}, + { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center',width: 200 }, + { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' ,width: 200}, + { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center',width: 200 }, + { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' ,width: 200}, + { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' ,width: 200}, + { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' ,width: 200}, + { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' ,width: 200}, + { title: '应收附加费', index: 'yingsfjf',render: 'yingsfjf', className: 'text-center' ,width: 200}, + { title: '已收附加费', index: 'yisfjf',render: 'yisfjf', className: 'text-center' ,width: 200}, + { title: '平均附加费率', index: 'fjfl', render: 'fjfl',className: 'text-center',width: 200 } ]; /** * 查询参数 diff --git a/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts b/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts index 9959782e..32f36a91 100644 --- a/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts +++ b/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-01 13:16:39 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-11 16:00:12 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\pillar\\pillar.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { Chart } from '@antv/g2'; import { DataService } from 'src/app/routes/datatable/services/data.service'; @@ -50,12 +60,19 @@ export class FinancetablePillarComponent implements OnInit, OnChanges { this.chart.scale('number', { nice: true, + // ticks: }); this.chart.tooltip({ showMarkers: false, shared: true, }); - + this.chart.axis('number', { + label: { + formatter: (val: any) => { + return '¥' + this.toThousands(val) ; + }, + }, + }); this.chart .interval() .position('time*number') @@ -71,5 +88,8 @@ export class FinancetablePillarComponent implements OnInit, OnChanges { this.chart.render(); } - + toThousands(num: string) { + const str = num.toString() + return str.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') + } } \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index e035bd05..af13dbb0 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -556,7 +556,7 @@ export class DatatableOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要更新的数据'); return; } - const ids = this.selectedRows.map(i => i?.id); + const ids = this.selectedRows.map(i => i?.orderId); this.service.request(this.service.$api_update_order_data, ids).subscribe(res => { if (res) { this.service.msgSrv.success('更新成功'); diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html index 05929852..b0b74755 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html @@ -20,7 +20,7 @@
- {{headerInfo?.ltdId}} + {{headerInfo?.ltdName}} {{headerInfo?.cnoName}} 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 703c57de..64c951c6 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 @@ -227,30 +227,30 @@ export class PayableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'phxcode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdName', width: 160 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'phxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 170 }, - { title: '收款账户', index: 'ltdaccountId', width: 170 }, + { title: '收款账户', index: 'ltdaccountId', width: 190 }, { title: '核销金额', index: 'phxmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}` }, { title: '应付金额', index: 'prmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.prmoney || 0)}` }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, { title: '收款人', index: 'driver2IdName', width: 120 }, - { title: '结算客户', index: 'cno', width: 120 }, - { title: '银行水单', index: 'bankreceipt', width: 120 }, - { title: '创建时间', index: 'createTime', width: 160 }, + { title: '结算客户', index: 'cnoName', width: 180 }, + { title: '银行水单', index: 'bankreceipt', width: 190 }, + { title: '创建时间', index: 'createTime', width: 180 }, // { title: '创建人', index: 'createUserIdLabel', width: 120 }, { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 }, { title: '核销备注', index: 'remarks', width: 120 }, diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index 98ac1a5e..a4db6171 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -32,7 +32,7 @@
- +