From c9afdb19d4b6cb4754f279ea839f927b748da40b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 16:52:20 +0800 Subject: [PATCH] fix bug --- .../rebate-setting/add/add.component.html | 6 +- .../rebate-table/rebate-table.component.ts | 55 +++++++++++-------- 2 files changed, 36 insertions(+), 25 deletions(-) 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 1762a6cb..e680165f 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-04-26 16:04:31 + * @LastEditTime : 2022-04-26 16:51:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -38,10 +38,10 @@
- +
- +
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index faf3a9e6..179735ca 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -3,35 +3,55 @@ import { Subject } from 'rxjs'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, Output, ViewChild } from '@angular/core'; import { BaseService } from '@shared'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { EventEmitter} from '@angular/core' +import { EventEmitter } from '@angular/core'; @Component({ selector: 'app-rebate-table', templateUrl: './rebate-table.component.html', styleUrls: ['./rebate-table.component.less'] }) export class RebateTableComponent implements OnInit { - @Input() data: any =[]; + @Input() data: any = []; @Input() type: any; + @Input() hiden!: boolean; @Output() private dataChange: EventEmitter = new EventEmitter(); emit() { - this.dataChange.emit(this.data) + this.dataChange.emit(this.data); } headers: any[] = []; - gradeConfigId: string =''; + gradeConfigId: string = ''; grage: any[] = []; formatterDollar = (value: number): string => `${value}`; changeSub = new Subject(); constructor(public service: BaseService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { - if(this.type == '2') { - this.loadData(); - + if (this.type == '2') { + this.loadData(); } + if (!this.hiden && this.type == '2') { + this.data = [ + { + gradeConfigId: '', + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; + } else if (!this.hiden && this.type == '1'){ + this.data = [ + { + gradeConfigId: 0, + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; + } + console.log(this.type); console.log(this.data); - + this.changeendAmountAction(); } @@ -39,21 +59,12 @@ export class RebateTableComponent implements OnInit { this.service.request('/api/mdc/partnerGradeConfig/listPartnerGradeConfig').subscribe(res => { if (res) { console.log(res); - this.grage = res; + this.grage = res; this.cdr.detectChanges(); } }); - // this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [ - // "rebate.config.minrebatePrice" - // ]).subscribe(res => { - // if (res) { - // console.log(res); - // } - // }); } - - /** * 修改结束公里数 * @param event 车长 @@ -70,7 +81,7 @@ export class RebateTableComponent implements OnInit { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { console.log(res); - + const paras = res.split(','); const num = Number(paras[0]); const i = Number(paras[1]); @@ -79,7 +90,7 @@ export class RebateTableComponent implements OnInit { console.log(this.data[i].endAmount); this.data[i].endAmount = null; setTimeout(() => { - this.data[i].endAmount = this.data[i]?.startAmount + 1 ; + this.data[i].endAmount = this.data[i]?.startAmount + 1; }, 0); this.changeNextstartAmount(this.data[i]?.startAmount + 1, i + 1); return; @@ -99,7 +110,7 @@ export class RebateTableComponent implements OnInit { gradeConfigId: '', startAmount: 0, endAmount: 0, - managementFeeRatio: 0, + managementFeeRatio: 0 }); this.data = [...this.data]; } @@ -108,7 +119,7 @@ export class RebateTableComponent implements OnInit { deleteRow(index: number) { console.log(index); var newArr = this.data.concat(); - newArr.splice(this.data.length-1,1) + newArr.splice(this.data.length - 1, 1); // this.data = this.data.pop() console.log(newArr); this.data = [...newArr];