diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index fb428f1e..d79f23d9 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -77,8 +77,10 @@ export class DatatableDataindexComponent implements OnInit { // 订单类型比例 this.service.request(this.service.$api_getBillTypeProportion).subscribe(res => { if (res) { - this.billTypeDatas = this.formatCoordinateData(res); - this.initBillChart(this.g2custom['el'].nativeElement as any); + const billTypeDatas2 = this.formatCoordinateData(res); + console.log(billTypeDatas2); + + this.initBillChart(this.g2custom['el'].nativeElement as any,billTypeDatas2); } }); // 大区业绩完成情况 @@ -98,6 +100,8 @@ export class DatatableDataindexComponent implements OnInit { this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => { if (res) { const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType }))); + console.log(billTypeDatas); + this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas); } }); @@ -141,7 +145,7 @@ export class DatatableDataindexComponent implements OnInit { chart.scale('percent', { formatter: val => { - val = val * 100 + '%'; + val = (val * 100 ).toFixed(0)+ '%'; return val; } }); @@ -198,7 +202,7 @@ export class DatatableDataindexComponent implements OnInit { .label('percent', percent => { return { content: data => { - return ` ${percent * 100}%`; + return (percent * 100).toFixed(0)+`%`; }, style: { fontSize: 14 } }; @@ -498,6 +502,8 @@ export class DatatableDataindexComponent implements OnInit { percent: Number((item.quantity / total).toFixed(2)) }); }); + console.log(rs); + return rs; } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index b247d051..5178117b 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -236,7 +236,9 @@ export class WithdrawalsDetailComponent implements OnInit { width: 140 }, { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 }, + { title: '网络货运人', index: 'ltdName', className: 'text-left', width: 200 }, { title: '货主', index: 'enterpriseInfoName', className: 'text-left', width: 200 }, + { title: '项目名称', index: 'enterpriseProjectName', className: 'text-left', width: 200 }, { title: '订单号', render: 'billId', width: 200 }, { title: '运单号', render: 'wayBillId', width: 200 }, { title: '货源编号', index: 'resourceCode', width: 200 },