From da4d794d9603adc3dd7022f60cf179540292c4c0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 17:27:57 +0800 Subject: [PATCH] fix bug --- .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 2 ++ .../components/list/list.component.html | 2 +- .../banner/components/list/list.component.ts | 3 +++ .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 3 +++ .../index/partner-list.component.html | 4 ++-- .../index/partner-list.component.ts | 5 +++++ .../routes/partner/partner-routing.module.ts | 21 ++++++++++++------- .../particulars/particulars.component.html | 2 +- .../rebate-record.component.html | 2 +- .../rebate-record/rebate-record.component.ts | 1 + .../rebate-setting.component.html | 4 ++-- .../rebate-setting.component.ts | 6 +++--- .../components/list/list.component.html | 2 +- .../components/list/list.component.ts | 5 +++++ 16 files changed, 46 insertions(+), 20 deletions(-) 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 9f21282a..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,15 +75,21 @@ 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, data: { guard: { ability: ['REBATE-PARTICULARS-search'] } } }, + { + 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 } @@ -128,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 }, @@ -148,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 } ] }, @@ -174,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/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index c66f3589..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: ['VEHICLE-LIST-view'] }, + 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: ['VEHICLE-LIST-view'] }, + acl: { ability: ['REBATE-SETTING-startUseing'] }, iif: (_record) =>{ return _record.stateLocked == false}, click: _record => this.viewEvaluate(_record), }, 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',