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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
潘晓云
2022-04-29 18:05:58 +08:00
parent f7628e9d1a 5286f029d9
commit e09f86232d
31 changed files with 140 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/components/customtable/customindex/customindex.component.html
View File

@ -4,13 +4,13 @@
* @Author : Shiming
* @Date : 2022-04-06 13:20:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-19 15:52:16
* @LastEditTime : 2022-04-29 17:55:02
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [title]="'客户报表'"></page-header-wrapper>
<div nz-row [nzGutter]="16">
<div nz-row [nzGutter]="16" acl [acl-ability]="['customindex-statisticsTotal']">
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'"
[footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">

18
src/app/routes/datatable/components/dataindex/dataindex.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:07
* @LastEditors : Shiming
* @LastEditTime : 2022-04-29 18:03:04
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\dataindex\\dataindex.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="6">
<g2-card [title]="AdvanceDepositTitle" [bordered]="true" [total]="totalAdvanceDeposit?.totalAmount || '¥ 0.00万'"
@ -65,12 +75,12 @@
</div>
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="6">
<nz-card><label class="chart_title">订单类型比例</label>
<nz-card acl [acl-ability]="['dataindex-getBillTypeProportion']"><label class="chart_title">订单类型比例</label>
<g2-custom #g2custom delay="100"></g2-custom>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="18">
<nz-card><label class="chart_title">大区业绩完成情况</label>
<nz-card acl [acl-ability]="['dataindex-getBillAmount']"><label class="chart_title">大区业绩完成情况</label>
<!-- <g2-timeline [data]="chartData" [titleMap]="{ y1: '订单金额（元）', y2: '' }" [height]="200" mask="MM月DD日"
[slider]="false"></g2-timeline> -->
<g2-custom #RegionalPerforman delay="100"></g2-custom>
@ -79,7 +89,7 @@
</div>
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="6">
<nz-card> <label class="chart_title">运单直付比例</label>
<nz-card acl [acl-ability]="['dataindex-getWayBillDirectProportion']"> <label class="chart_title">运单直付比例</label>
<!-- <g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
(clickItem)="handleClick($event)" [lineWidth]="10">
</g2-pie> -->
@ -87,7 +97,7 @@
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="18">
<nz-card>
<nz-card acl [acl-ability]="['dataindex-getBillPaymentAmount']">
<label class="chart_title">业绩完成情况</label>
<!-- <g2-bar [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar> -->
<g2-custom #SaleProportion delay="100"></g2-custom>

2
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -51,6 +51,6 @@
</div>
</div>
<st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
[loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
</st>
</nz-card>

1
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -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
) {

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -117,7 +117,7 @@
<ng-template #extraTemplate>
<div>
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
[acl-ability]="['ORDER-RECEIPTS-search']">筛选</button>
<button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>

2
src/app/routes/partner/account-management/components/account-detail/account-detail.component.html
View File

@ -32,7 +32,7 @@
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
<button nz-button (click)="export()" nzType="primary" acl [acl-ability]="['AM-DETAIL-export']" nzGhost>导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@ -8,7 +8,7 @@
<sf [schema]="schema" [mode]="'search'" [ui]="ui" [button]="'none'" #sf>
<button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
<button nz-button (click)="export()" nzType="primary" nzGhost acl [acl-ability]="['AM-LIST-export']">导出</button>
</sf>
</nz-card>
@ -24,7 +24,7 @@
<ng-template st-row="unEntryAmount" let-item>
<a class="text-right text-blue-dark"
[routerLink]="'/partner/account-management/am/recorded/detail/'+item?.roleId">{{item.unEntryAmount | currency:'
'}}</a>
'}} acl [acl-ability]="['AM-LIST-unEntryAmount']"</a>
</ng-template>
<ng-template st-row="availableBalance" let-item>
<div class="text-right">{{item.availableBalance | currency:' '}}</div>

1
src/app/routes/partner/account-management/components/list/list.component.ts
View File

@ -77,6 +77,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
buttons: [
{
text: '虚拟账户明细',
acl: { ability: ['AM-LIST-viewVirtual'] },
click: (_record) => this.viewVirtual(_record)
}
]

2
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
View File

@ -92,10 +92,12 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
buttons: [
{
text: '查看入账记录',
acl: { ability: ['AN-RECORDED-DETAIL-viewRecord'] },
click: (_record) => this.viewBookedRecord(_record)
},
{
text: '查看账单明细',
acl: { ability: ['AN-RECORDED-DETAIL-viewBill'] },
click: (_record) => this.viewAccountDetail(_record)
},
]

4
src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
View File

@ -10,7 +10,7 @@
class="text-right">
<button nz-button nzType="primary" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button acl [acl-ability]="['AM-WITHDRAW-RECORD-export']"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -37,7 +37,7 @@
totalCallNo }}</strong>
<!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
</div>
<button nz-button (click)="this.auditAction(null)">审核</button>
<button nz-button (click)="this.auditAction(null)" acl [acl-ability]="['AM-WITHDRAW-RECORD-audit']">审核</button>
</div>
</ng-template>

4
src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
View File

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

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
}

50
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,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 }
]
}

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),
}
]

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

@ -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) => {

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" >导出</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()">新增</button>
<button nz-button nzType="primary" (click)="configAction()" acl [acl-ability]="['REBATE-SETTING-add']">新增</button>
</div>
</div>
<st

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

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

4
src/app/routes/partner/recorded/components/record/record.component.html
View File

@ -10,7 +10,7 @@
class="text-right">
<button nz-button nzType="primary" (click)="search()">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button acl [acl-ability]="['RECORDED-LIST-export']"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -36,7 +36,7 @@
totalCallNo }}</strong>
<!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
</div>
<button nz-button (click)="this.auditAction(null)">审核</button>
<button nz-button (click)="this.auditAction(null)" acl [acl-ability]="['RECORDED-LIST-audit']">审核</button>
</div>
</ng-template>

3
src/app/routes/partner/recorded/components/record/record.component.ts
View File

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

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

8
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

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