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-04-29 17:27:57 +08:00
parent b8ac1fcdd7
commit da4d794d96
16 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/partner/channel-sales/components/list/list.component.html
View File

@ -21,7 +21,7 @@
</nz-card>
<nz-card>
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>新增</button>
<button nz-button nzType="primary" style="margin-bottom: 24px" acl [acl-ability]="['channelSales-add']" (click)="add()"><i nz-icon nzType="plus"></i>新增</button>
<!-- 数据列表 -->
<st
#st

2
src/app/routes/partner/channel-sales/components/list/list.component.ts
View File

@ -126,10 +126,12 @@ export class ParterChannelSalesListComponent implements OnInit {
buttons: [
{
text: '编辑',
acl: { ability: ['channelSales-edit'] },
click: (_record, _modal, _instance) => this.edit(_record),
},
{
text: '冻结',
acl: { ability: ['channelSales-frozen'] },
click: (_record, _modal, _instance) => this.stop(_record),
}
]

2
src/app/routes/partner/knowledge/banner/components/list/list.component.html
View File

@ -27,7 +27,7 @@
<!-- 工具栏 -->
<div nz-row>
<div nz-col nzSpan="24">
<button nz-button nzType="primary" (click)="add()">新增banner</button>
<button nz-button nzType="primary" (click)="add()" acl [acl-ability]="['banner-add']">新增banner</button>
</div>
</div>

3
src/app/routes/partner/knowledge/banner/components/list/list.component.ts
View File

@ -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',

2
src/app/routes/partner/level-config/components/list/list.component.html
View File

@ -11,7 +11,7 @@
</nz-card>
<nz-card>
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>新增</button>
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()" acl [acl-ability]="['LevelConfig-add']"><i nz-icon nzType="plus"></i>新增</button>
<!-- 数据列表 -->
<st
#st

3
src/app/routes/partner/level-config/components/list/list.component.ts
View File

@ -105,15 +105,18 @@ export class ParterLevelConfigListComponent implements OnInit {
buttons: [
{
text: '编辑',
acl: { ability: ['LevelConfig-edit'] },
click: (_record, _modal, _instance) => 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
}

4
src/app/routes/partner/partner-list/components/index/partner-list.component.html
View File

@ -20,9 +20,9 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.routeTo('/partner/partner-list/add-etp-partner')" nzType="primary">新增企业合伙人</button>
<button nz-button (click)="this.routeTo('/partner/partner-list/add-etp-partner')" nzType="primary" acl [acl-ability]="['ENTERPRISE-saveEnterprise']">新增企业合伙人</button>
<button nz-button (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
nzType="primary">新增个人合伙人</button>
nzType="primary" acl [acl-ability]="['ENTERPRISE-savePersonally']">新增个人合伙人</button>
</div>
<st #st [data]="service.$api_get_partner_page" [columns]="columns" [req]="{ process: beforeReq }"

5
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -449,12 +449,14 @@ export class PartnerListComponent {
{ type: 'divider' },
{
text: '审核',
acl: { ability: ['ENTERPRISE-audit'] },
iif: item => item.id && item.approvalStatus === 10,
click: item => this.auditPartner(item)
},
{
text: '详情<br>',
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
}

21
src/app/routes/partner/partner-routing.module.ts
View File

@ -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 }
]
}

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

@ -32,7 +32,7 @@
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['REBATE-PARTICULARS-export']" >导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

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

@ -23,7 +23,7 @@
></sf>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['REBATE-RECORD-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
</div>
</div>

1
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
View File

@ -106,6 +106,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
buttons: [
{
text: '明细',
acl: { ability: ['REBATE-RECORD-detail'] },
click: _record => this.viewEvaluate(_record),
}
]

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

@ -23,7 +23,7 @@
></sf>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['VEHICLE-LIST-search']">导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['REBATE-SETTING-export']">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
</div>
</div>
@ -34,7 +34,7 @@
<!-- +新增 -->
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="configAction()" acl [acl-ability]="['VEHICLE-LIST-search']">新增</button>
<button nz-button nzType="primary" (click)="configAction()" acl [acl-ability]="['REBATE-SETTING-add']">新增</button>
</div>
</div>
<st

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

@ -125,18 +125,18 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
buttons: [
{
text: '查看',
acl: { ability: ['VEHICLE-LIST-view'] },
acl: { ability: ['REBATE-SETTING-detail'] },
click: _record => 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),
},

2
src/app/routes/partner/scrollimg/components/list/list.component.html
View File

@ -27,7 +27,7 @@
<!-- 工具栏 -->
<div nz-row>
<div nz-col nzSpan="24">
<button nz-button nzType="primary" (click)="add()">新增轮播图</button>
<button nz-button nzType="primary" (click)="add()" acl [acl-ability]="['scrollimg-add']">新增轮播图</button>
</div>
</div>

5
src/app/routes/partner/scrollimg/components/list/list.component.ts
View File

@ -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',