diff --git a/proxy.conf.js b/proxy.conf.js
index 50eec04b..e26e2071 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-28 16:08:43
+ * @LastEditTime : 2022-05-05 13:51:19
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
- host: 'tms-api-test.eascs.com',
+ host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},
diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.html b/src/app/routes/partner/channel-sales/components/edit/edit.component.html
index 7386c7af..39fa35c5 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.html
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.html
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
index 613a7da2..8c971305 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.ts
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -127,11 +127,13 @@ export class ParterChannelSalesListComponent implements OnInit {
{
text: '编辑',
acl: { ability: ['channelSales-edit'] },
+ iif: (item) => {return item.stateLocked == false},
click: (_record, _modal, _instance) => this.edit(_record),
},
{
text: '冻结',
acl: { ability: ['channelSales-frozen'] },
+ iif: (item) => {return item.stateLocked == false},
click: (_record, _modal, _instance) => this.stop(_record),
}
]
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 262e6397..1b3a47a4 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-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
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -155,21 +155,35 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.service.msgSrv.warning('请选择合伙人范围!');
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) {
this.service.msgSrv.warning('请选择合伙人!');
return
}
let real = false;
+ 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;
- // }
+ }
+ if (real) {
+ this.service.msgSrv.warning('初始业务量不能超过到达业务量!');
+ return;
+ }
const params = {
accountingRate: this.accountingRate,
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 0e6581fc..cf5f8e30 100644
--- a/src/app/shared/components/rebate-table/rebate-table.component.ts
+++ b/src/app/shared/components/rebate-table/rebate-table.component.ts
@@ -43,8 +43,6 @@ export class RebateTableComponent implements OnInit {
this.data = [
{
gradeConfigId: '0',
- startAmount: 0,
- endAmount: 0,
managementFeeRatio: 0,
}
];