diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html
index 3c08cb1a..f30b8125 100644
--- a/src/app/routes/datatable/components/dataindex/dataindex.component.html
+++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html
@@ -1,3 +1,13 @@
+
-
+
-
+
@@ -79,7 +89,7 @@
-
+
@@ -87,7 +97,7 @@
-
+
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
index cbe647cb..be7fcedf 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
@@ -51,6 +51,6 @@
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
\ No newline at end of file
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
index 447dfa8f..bfada0b6 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@@ -23,7 +23,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
info: any = {};
constructor(
public service: FreightAccountService,
- private nzModalService: NzModalService,
private router: Router,
public searchDrawerService: SearchDrawerService
) {
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
index 6fb9d4f8..14dceaa9 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@@ -117,7 +117,7 @@
+ [acl-ability]="['ORDER-RECEIPTS-search']">筛选
diff --git a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
index b232905e..9ef939b5 100644
--- a/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
@@ -32,7 +32,7 @@
-
+
-
+
diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 3388d7a5..3c579f38 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -309,6 +309,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
{
text: '查看回单',
iif: item => item.refundStatus === '3',
+ acl: { ability: ['AM-WITHDRAW-RECORD-viewRefund'] },
click: item =>
this.service.getReceiptUrl(item.receiptUrl, {
bankType: item.bankType,
@@ -322,15 +323,18 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
{
text: '查看原因',
iif: item => item.refundStatus === '4',
+ acl: { ability: ['AM-WITHDRAW-RECORD-viewResult'] },
click: item => this.showReason(item)
},
{
text: '审核',
iif: item => item.refundStatus === '1',
+ acl: { ability: ['AM-WITHDRAW-RECORD-oneAudit'] },
click: item => this.auditAction(item)
},
{
text: '详情',
+ acl: { ability: ['AM-WITHDRAW-RECORD-detail'] },
click: item => this.router.navigate(['./../detail/' + item.id], { relativeTo: this.ar })
}
]
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.html b/src/app/routes/partner/channel-sales/components/list/list.component.html
index 8b7dd971..1183199e 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.html
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.html
@@ -21,7 +21,7 @@
-
+
this.edit(_record),
},
{
text: '冻结',
+ acl: { ability: ['channelSales-frozen'] },
click: (_record, _modal, _instance) => this.stop(_record),
}
]
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.html b/src/app/routes/partner/knowledge/banner/components/list/list.component.html
index d533734b..f56f199d 100644
--- a/src/app/routes/partner/knowledge/banner/components/list/list.component.html
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.html
@@ -27,7 +27,7 @@
diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
index aae33fa5..8728b5a8 100644
--- a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
@@ -156,12 +156,14 @@ export class BannerComponentsListComponent implements OnInit {
buttons: [
{
text: '修改',
+ acl: { ability: ['banner-change'] },
click: (item) => {
this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
}
},
{
text: '禁用',
+ acl: { ability: ['banner-forbidden'] },
pop: {
title: `确定禁用此banner图吗？？`,
okType: 'danger',
@@ -174,6 +176,7 @@ export class BannerComponentsListComponent implements OnInit {
},
{
text: '启用',
+ acl: { ability: ['banner-startUseing'] },
pop: {
title: `确定启用此banner图吗？`,
okType: 'danger',
diff --git a/src/app/routes/partner/level-config/components/list/list.component.html b/src/app/routes/partner/level-config/components/list/list.component.html
index e6f50f99..e422e411 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.html
+++ b/src/app/routes/partner/level-config/components/list/list.component.html
@@ -11,7 +11,7 @@
-
+
this.edit(_record)
},
{
text: '禁用',
+ acl: { ability: ['LevelConfig-forbidden'] },
click: (_record, _modal, _instance) => this.stop(_record),
iif: item => !item.stateLocked
},
{
text: '启用',
+ acl: { ability: ['LevelConfig-startUseing'] },
click: (_record, _modal, _instance) => this.restart(_record),
iif: item => item.stateLocked
}
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
index b0388b2c..bce2f3b2 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html
@@ -20,9 +20,9 @@
-
+
+ nzType="primary" acl [acl-ability]="['ENTERPRISE-savePersonally']">新增个人合伙人
item.id && item.approvalStatus === 10,
click: item => this.auditPartner(item)
},
{
text: '详情
',
iif: item => item.id,
+ acl: { ability: ['ENTERPRISE-detail'] },
click: item => {
if (item.partnerType === 1) {
this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]);
@@ -466,15 +468,18 @@ export class PartnerListComponent {
{
text: '修改返佣模板',
iif: item => item.id,
+ acl: { ability: ['ENTERPRISE-updateTemplate'] },
click: item => this.editTemplateAction(item)
},
{
text: '修改渠道销售',
iif: item => item.id,
+ acl: { ability: ['ENTERPRISE-updateChannelCheck'] },
click: item => this.editCannelAction(item)
},
{
text: '重发CRM流程',
+ acl: { ability: ['ENTERPRISE-reSendCrm'] },
click: item => item.id && this.reSendCRM(item),
iif: item => item.crmStatus === 10
}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index 277e01d4..f52f310b 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -66,7 +66,8 @@ const routes: Routes = [
{
path: 'channel-sales',
children: [
- { path: '', component: ParterChannelSalesListComponent },
+ { path: '', component: ParterChannelSalesListComponent,
+ data: { guard: { ability: ['channelSales-search'] } } },
{ path: 'list', component: ParterChannelSalesListComponent },
{ path: 'edit', component: ParterChannelSalesEditComponent }
]
@@ -74,20 +75,27 @@ const routes: Routes = [
{
path: 'level-config',
children: [
- { path: '', component: ParterLevelConfigListComponent },
- { path: 'list', component: ParterLevelConfigListComponent },
+ { path: '', component: ParterLevelConfigListComponent,
+ data: { guard: { ability: ['LevelConfig-search'] } } },
+ { path: 'list', component: ParterLevelConfigListComponent ,
+ data: { guard: { ability: ['LevelConfig-search'] } } },
{ path: 'edit', component: ParterLevelConfigEditComponent }
]
},
{
path: 'rebate',
children: [
- { path: 'particulars', component: ParterRebateManageMentParticularsComponent },
- { path: 'record', component: ParterRebateManageMentRecordComponent },
- { path: 'setting', component: ParterRebateManageMentSettingComponent },
+ {
+ path: 'particulars',
+ component: ParterRebateManageMentParticularsComponent,
+ data: { guard: { ability: ['REBATE-PARTICULARS-search'] } }
+ },
+ { path: 'record', component: ParterRebateManageMentRecordComponent, data: { guard: { ability: ['REBATE-RECORD-search'] } } },
+ { path: 'setting', component: ParterRebateManageMentSettingComponent, data: { guard: { ability: ['REBATE-SETTING-search'] } } },
{ path: 'setting/add/:id', component: ParterRebateManageMentAddComponent }
]
},
+ // 账户管理
{
path: 'account-management',
children: [
@@ -95,16 +103,30 @@ const routes: Routes = [
path: 'am',
children: [
{ path: '', redirectTo: 'list' },
- { path: 'list', component: PartnerAccountManagementListComponent },
- { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
- { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent }
+ { path: 'list', component: PartnerAccountManagementListComponent, data: { guard: { ability: ['AM-LIST-search'] } } },
+ // 合伙人账户明细
+ {
+ path: 'detail/:id',
+ component: PartnerAccountManagementAccountDetailComponent,
+ data: { guard: { ability: ['AM-LIST-search'] } }
+ },
+ // 待入账明细
+ {
+ path: 'recorded/detail/:id',
+ component: PartnerAccountManagementRecordedDetailComponent,
+ data: { guard: { ability: ['AN-RECORDED-DETAIL-search'] } }
+ }
]
},
{
path: 'withdraw-record',
children: [
{ path: '', redirectTo: 'list' },
- { path: 'list', component: PartnerAccountManagementWithdrawalsRecordComponent },
+ {
+ path: 'list',
+ component: PartnerAccountManagementWithdrawalsRecordComponent,
+ data: { guard: { ability: ['AM-WITHDRAW-RECORD-search'] } }
+ },
{ path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
]
}
@@ -113,7 +135,7 @@ const routes: Routes = [
{
path: 'partner-list',
children: [
- { path: '', component: PartnerListComponent },
+ { path: '', component: PartnerListComponent, data: { guard: { ability: ['ENTERPRISE-search'] } } },
{ path: 'etp-detail/:id', component: PartnerDetailComponent },
{ path: 'personal-detail/:id', component: PersonalPartnerDetailComponent },
{ path: 'add-etp-partner', component: AddEtpPartnerComponent },
@@ -133,7 +155,7 @@ const routes: Routes = [
path: 'scrollimg',
children: [
{ path: '', component: ScrollImgComponentsListComponent },
- { path: 'list', component: ScrollImgComponentsListComponent },
+ { path: 'list', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } },
{ path: 'detail', component: ScrollimgComponentsAddComponent }
]
},
@@ -148,7 +170,7 @@ const routes: Routes = [
{
path: 'recorded',
children: [
- { path: 'record', component: PartnerRecordedRecordComponent },
+ { path: 'record', component: PartnerRecordedRecordComponent, data: { guard: { ability: ['RECORDED-LIST-search'] } } },
{ path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
]
},
@@ -159,7 +181,7 @@ const routes: Routes = [
{ path: 'article-management-list', component: ParterArticleManagementListComponent },
{ path: 'article-management-add', component: ParterArticleManagementEditComponent },
{ path: 'article-management-edit', component: ParterArticleManagementEditComponent },
- { path: 'banner', component: BannerComponentsListComponent },
+ { path: 'banner', component: BannerComponentsListComponent, data: { guard: { ability: ['banner-search'] } } },
{ path: 'banner/detail', component: BannerComponentsAddComponent }
]
}
diff --git a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
index 2b4246d2..1bfdebb2 100644
--- a/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
+++ b/src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
@@ -32,7 +32,7 @@
-
+
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
index e1d2b4c3..7426e912 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@@ -106,6 +106,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
buttons: [
{
text: '明细',
+ acl: { ability: ['REBATE-RECORD-detail'] },
click: _record => this.viewEvaluate(_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 c0740d72..262e6397 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-27 14:14:32
+ * @LastEditTime : 2022-04-29 16:23:18
* @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,29 +143,29 @@ 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(!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;
@@ -184,12 +184,12 @@ export class ParterRebateManageMentAddComponent implements OnInit {
};
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']);
- // }
- // });
+ 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) => {
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
index b433bc9f..c0655917 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
@@ -23,7 +23,7 @@
>
-
+
@@ -34,7 +34,7 @@
this.configAction(_record),
},
{
text: '禁用',
+ acl: { ability: ['REBATE-SETTING-forbidden'] },
iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)},
click: _record => this.viewEvaluate(_record),
},
{
text: '启用',
+ acl: { ability: ['REBATE-SETTING-startUseing'] },
iif: (_record) =>{ return _record.stateLocked == false},
click: _record => this.viewEvaluate(_record),
},
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index ca550d9d..d20b2fcf 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -10,7 +10,7 @@
class="text-right">
-
+
-
+
diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts
index 74f14074..33b39d9a 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.ts
+++ b/src/app/routes/partner/recorded/components/record/record.component.ts
@@ -316,15 +316,18 @@ export class PartnerRecordedRecordComponent implements OnInit {
{
text: '审核',
iif: item => item.sts === '0',
+ acl: { ability: ['RECORDED-LIST-oneAudit'] },
click: item => this.auditAction(item)
},
{
text: '复审',
iif: item => item.sts === '1',
+ acl: { ability: ['RECORDED-LIST-recheck'] },
click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
},
{
text: '详情',
+ acl: { ability: ['RECORDED-LIST-detail'] },
click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
}
]
diff --git a/src/app/routes/partner/scrollimg/components/list/list.component.html b/src/app/routes/partner/scrollimg/components/list/list.component.html
index 54ecf965..f19ec73f 100644
--- a/src/app/routes/partner/scrollimg/components/list/list.component.html
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.html
@@ -27,7 +27,7 @@
diff --git a/src/app/routes/partner/scrollimg/components/list/list.component.ts b/src/app/routes/partner/scrollimg/components/list/list.component.ts
index f1b7e90d..df110002 100644
--- a/src/app/routes/partner/scrollimg/components/list/list.component.ts
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.ts
@@ -176,12 +176,14 @@ export class ScrollImgComponentsListComponent implements OnInit {
buttons: [
{
text: '修改',
+ acl: { ability: ['scrollimg-change'] },
click: (item) => {
this.router.navigate(['../detail'], { queryParams: { id: item.id, type: 'edit' }, relativeTo: this.ar });
}
},
{
text: '禁用',
+ acl: { ability: ['scrollimg-forbidden'] },
pop: {
title: `是否确认禁用？`,
okType: 'danger',
@@ -194,6 +196,7 @@ export class ScrollImgComponentsListComponent implements OnInit {
},
{
text: '启用',
+ acl: { ability: ['scrollimg-startUseing'] },
pop: {
title: `是否确认启用？`,
okType: 'danger',
@@ -206,12 +209,14 @@ export class ScrollImgComponentsListComponent implements OnInit {
},
{
text: '查看',
+ acl: { ability: ['scrollimg-detail'] },
click: (item) => {
this.router.navigate(['../view'], { queryParams: { id: item.id, type: 'view' }, relativeTo: this.ar });
}
},
{
text: '删除',
+ acl: { ability: ['scrollimg-delete'] },
pop: {
title: `确定删除吗？`,
okType: 'danger',
diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
index 2a98b86e..28b4dac9 100644
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
@@ -288,7 +288,13 @@ export class ETCBlacklistComponent implements OnInit {
className: 'text-center',
buttons: [
{
- text: '删除',
+ text: '删除', iif: () => this.tabType === 1,
+ acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteFreight'] },
+ click: item => this.deleteAction(item)
+ },
+ {
+ text: '删除', iif: () => this.tabType === 2,
+ acl: { ability: ['TICKET-ETC-BLACK_LIST-deleteCart'] },
click: item => this.deleteAction(item)
}
]