Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 15:34:00 +08:00
parent 527d8305c1
commit 741b5e4f8e
10 changed files with 135 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 13:38:57
* @LastEditTime : 2022-04-27 15:03:23
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

70
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 13:44:19
* @LastEditTime : 2022-04-27 14:14:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -143,33 +143,33 @@ export class ParterRebateManageMentAddComponent implements OnInit {
});
}
save() {
if(!this.configName) {
this.service.msgSrv.warning('请输入配置名称！');
return
}
if(!this.accountingRate) {
this.service.msgSrv.warning('请输入固定结算费率！');
return
}
if(!this.partnerType) {
this.service.msgSrv.warning('请选择合伙人范围！');
return
}
if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
this.service.msgSrv.warning('请选择合伙人！');
return
}
let real = false;
this.table.data.forEach((element: any) => {
if (element.startAmount > element.endAmount) {
real = true;
return;
}
});
if (real) {
this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
return;
}
// if(!this.configName) {
// this.service.msgSrv.warning('请输入配置名称！');
// return
// }
// if(!this.accountingRate) {
// this.service.msgSrv.warning('请输入固定结算费率！');
// return
// }
// if(!this.partnerType) {
// this.service.msgSrv.warning('请选择合伙人范围！');
// return
// }
// if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
// this.service.msgSrv.warning('请选择合伙人！');
// return
// }
// let real = false;
// this.table.data.forEach((element: any) => {
// if (element.startAmount > element.endAmount) {
// real = true;
// return;
// }
// });
// if (real) {
// this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
// return;
// }
const params = {
accountingRate: this.accountingRate,
@ -182,12 +182,14 @@ export class ParterRebateManageMentAddComponent implements OnInit {
remark: this.remark,
partnerType: this.partnerType
};
this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('新增成功！');
this.router.navigate(['/partner/rebate/setting']);
}
});
console.log(params);
// this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
// if (res) {
// this.service.msgSrv.success('新增成功！');
// this.router.navigate(['/partner/rebate/setting']);
// }
// });
}
initData(id: string) {
this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, { id: id }).subscribe((res: any) => {

2
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
View File

@ -58,7 +58,7 @@
<div *ngIf="item.partnerType == 3">自定义合伙人</div>
</ng-template>
<ng-template st-row='stateLocked' let-item let-index='index'>
<div >{{item?.stateLocked ? '启用' : '禁用'}}</div>
<div >{{item?.stateLocked ? '生效中' : '失效'}}</div>
</ng-template>
</st>
</nz-card>

8
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
View File

@ -77,12 +77,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
initST() {
this.columns = [
{
title: '配置名称',
title: '模板名称',
index: 'configName',
width: '200px',
},
{
title: '配置类型',
title: '等级类型',
render: 'configType',
width: '200px',
@ -93,7 +93,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
width: '250px',
},
{
title: '关联合伙人范围',
title: '合伙人范围',
render: 'partnerType',
width: '200px',
},
@ -103,7 +103,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
width: '200px',
},
{
title: '启用时间',
title: '生效时间',
index: 'enableTime',
width: '200px',
},