diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index f30b8125..b3037220 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -1,5 +1,5 @@ @@ -75,12 +75,12 @@
- +
- + @@ -89,7 +89,7 @@
- + @@ -97,11 +97,11 @@
- +
-
\ No newline at end of file +
diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index d79f23d9..12562a13 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie'; @@ -18,7 +18,7 @@ import { GeometryLabelCfg } from '@antv/g2/lib/interface'; styleUrls: ['./dataindex.component.less'], providers: [CurrencyPipe] }) -export class DatatableDataindexComponent implements OnInit { +export class DatatableDataindexComponent implements OnInit, AfterViewInit { @ViewChild('AdvanceDeposit', { static: false }) AdvanceDeposit!: G2CustomComponent; @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent; @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent; @@ -38,13 +38,16 @@ export class DatatableDataindexComponent implements OnInit { regionalPerformanceCompletion: DataPerformanceTrendVO[] = []; - constructor(private service: DataService, private currency: CurrencyPipe) {} - - ngOnInit(): void { + constructor(private service: DataService, private currency: CurrencyPipe) { } + ngAfterViewInit(): void { this.initMiniAreaData(); this.initOthersData(); } + ngOnInit(): void { + + } + private initMiniAreaData() { // 客户预存款总额 this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => { @@ -79,8 +82,8 @@ export class DatatableDataindexComponent implements OnInit { if (res) { const billTypeDatas2 = this.formatCoordinateData(res); console.log(billTypeDatas2); - - this.initBillChart(this.g2custom['el'].nativeElement as any,billTypeDatas2); + + this.initBillChart(this.g2custom['el'].nativeElement as any, billTypeDatas2); } }); // 大区业绩完成情况 @@ -101,7 +104,6 @@ export class DatatableDataindexComponent implements OnInit { 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); } }); @@ -145,7 +147,7 @@ export class DatatableDataindexComponent implements OnInit { chart.scale('percent', { formatter: val => { - val = (val * 100 ).toFixed(0)+ '%'; + val = (val * 100).toFixed(0) + '%'; return val; } }); @@ -202,7 +204,7 @@ export class DatatableDataindexComponent implements OnInit { .label('percent', percent => { return { content: data => { - return (percent * 100).toFixed(0)+`%`; + return (percent * 100).toFixed(0) + `%`; }, style: { fontSize: 14 } }; @@ -351,6 +353,8 @@ export class DatatableDataindexComponent implements OnInit { } return {}; }); + console.log(chart); + chart.render(); } @@ -503,7 +507,7 @@ export class DatatableDataindexComponent implements OnInit { }); }); console.log(rs); - + return rs; } diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 8abf1189..1850a25b 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-05-07 15:42:10 + * @LastEditTime : 2022-05-11 17:04:39 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,7 +23,14 @@ 固定结算费率配置 -  % @@ -74,15 +81,26 @@ - - + +
+ 1、指全部合伙人、新注册合伙人、自定义合伙人三种范围优先执行的顺序，等级数字越大，优先执行该返佣模板
+ 2、同一合伙人范围的按创建时间最新的执行返佣模板 +
+