diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts
index aa8b8e33..d315545d 100644
--- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts
+++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts
@@ -86,6 +86,8 @@ export class DatatableOperationtableComponent implements OnInit {
this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => {
if (res) {
this.chartData = res
+ this.pillar.reRender()
+ this.curve.reRender()
if(flag) { // 除第一次加载外
this.pillar.reRender()
this.curve.reRender()
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts
index 4acbe111..c8f5b08e 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts
@@ -54,12 +54,24 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
buttons: [
{
text: '添加',
+ iifBehavior: 'disabled',
+ iif: (item:any) => {
+ return this.filterArr(item)
+ },
click: _record => this.add(_record),
}
]
}
];
-
+ filterArr (item: { id: any; }) {
+ let real = true
+ this.i.forEach((element:any) => {
+ if(element.id == item.id) {
+ real = false
+ }
+ });
+ return real
+ }
get reqParams() {
// signStatus固定传20 代表签约完成 signStatus: 20
let params: any = { ...this.sf?.value, };
@@ -78,6 +90,8 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
) {}
ngOnInit(): void {
+ console.log(this.i);
+
this.initSF();
}
initSF() {
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 bff494dd..8abf1189 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-05 17:04:31
+ * @LastEditTime : 2022-05-07 15:42:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -58,7 +58,7 @@
- 添加
+ 添加
0"
#st
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
index 1b3a47a4..7d8abd4a 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming
- * @LastEditTime : 2022-05-05 14:04:53
+ * @LastEditTime : 2022-05-07 15:38:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -127,59 +127,70 @@ export class ParterRebateManageMentAddComponent implements OnInit {
if (res) {
if (Array.isArray(res)) {
this.partnerPeopleList = this.partnerPeopleList.concat(res);
+ this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')];
res.forEach((ele: any) => {
this.partnerId.push(ele?.id);
});
} else {
this.partnerPeopleList = this.partnerPeopleList.concat(res);
+ this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')];
this.partnerId.push(res?.id);
}
}
});
}
+ // 数组去重
+ setArr(arr: any[], id: string) {
+ let obj: any = {};
+ const arrays = arr.reduce((setArr, item) => {
+ obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+ return setArr;
+ }, []);
+ return arrays;
+ }
delete(item: any) {
this.partnerPeopleList = this.partnerPeopleList.filter((d: any, i: any) => {
return item.id != d.id;
});
}
save() {
- if(!this.configName) {
+ if (!this.configName) {
this.service.msgSrv.warning('请输入配置名称!');
- return
+ return;
}
- if(!this.accountingRate) {
+ if (!this.accountingRate) {
this.service.msgSrv.warning('请输入固定结算费率!');
- return
+ return;
}
- if(!this.partnerType) {
+ if (!this.partnerType) {
this.service.msgSrv.warning('请选择合伙人范围!');
- return
+ return;
}
- if(!this.priority) {
+ if (!this.priority) {
this.service.msgSrv.warning('请选择优先级!');
- return
+ return;
}
- if(!this.sf?.value.ruleDescription) {
+ if (!this.sf?.value.ruleDescription) {
this.service.msgSrv.warning('请输入规则说明!');
- return
+ return;
}
- if(!this.remark) {
+ if (!this.remark) {
this.service.msgSrv.warning('请输入备注!');
- return
+ return;
}
- if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
+ if (this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
this.service.msgSrv.warning('请选择合伙人!');
- return
+ return;
}
let real = false;
- if(this.configType == '2') {
- this.table.data.forEach((element: any) => {
- if (element.startAmount > element.endAmount) {
- real = true;
- return;
- }
- });
- }
+ if (this.configType == '2') {
+ this.table.data.forEach((element: any) => {
+ if (element.startAmount > element.endAmount) {
+ real = true;
+ return;
+ }
+ });
+ }
if (real) {
this.service.msgSrv.warning('初始业务量不能超过到达业务量!');
return;
@@ -197,7 +208,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
partnerType: this.partnerType
};
console.log(params);
-
+
this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('新增成功!');