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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-05 14:05:15 +08:00
parent 7221365583
commit b0d4a52869
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-28 16:08:43 * @LastEditTime : 2022-05-05 13:51:19
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -30,7 +30,7 @@ module.exports = {
// }, // },
'//api': { '//api': {
target: { target: {
host: 'tms-api-test.eascs.com', host: 'tms-api-dev.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-21 09:26:45 * @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-29 16:23:18 * @LastEditTime : 2022-05-05 14:04:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -155,21 +155,35 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.service.msgSrv.warning('请选择合伙人范围！'); this.service.msgSrv.warning('请选择合伙人范围！');
return return
} }
if(!this.priority) {
this.service.msgSrv.warning('请选择优先级！');
return
}
if(!this.sf?.value.ruleDescription) {
this.service.msgSrv.warning('请输入规则说明！');
return
}
if(!this.remark) {
this.service.msgSrv.warning('请输入备注！');
return
}
if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
this.service.msgSrv.warning('请选择合伙人！'); this.service.msgSrv.warning('请选择合伙人！');
return return
} }
let real = false; let real = false;
if(this.configType == '2') {
this.table.data.forEach((element: any) => { this.table.data.forEach((element: any) => {
if (element.startAmount > element.endAmount) { if (element.startAmount > element.endAmount) {
real = true; real = true;
return; return;
} }
}); });
// if (real) { }
// this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); if (real) {
// return; this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
// } return;
}
const params = { const params = {
accountingRate: this.accountingRate, accountingRate: this.accountingRate,

2
src/app/shared/components/rebate-table/rebate-table.component.ts
View File

@ -43,8 +43,6 @@ export class RebateTableComponent implements OnInit {
this.data = [ this.data = [
{ {
gradeConfigId: '0', gradeConfigId: '0',
startAmount: 0,
endAmount: 0,
managementFeeRatio: 0, managementFeeRatio: 0,
} }
]; ];