From 1f9af1e116bc8b1f8c1002b95864f2372f79a03d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 16:23:23 +0800 Subject: [PATCH] fix bug --- .../account-detail.component.html | 2 +- .../components/list/list.component.html | 4 +- .../components/list/list.component.ts | 1 + .../recorded-detail.component.ts | 2 + .../withdrawals-record.component.html | 4 +- .../withdrawals-record.component.ts | 4 ++ .../routes/partner/partner-routing.module.ts | 31 +++++++--- .../rebate-setting/add/add.component.ts | 60 +++++++++---------- .../rebate-setting.component.html | 4 +- .../rebate-setting.component.ts | 3 + .../components/record/record.component.html | 4 +- .../components/record/record.component.ts | 3 + 12 files changed, 75 insertions(+), 47 deletions(-) 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 @@
- + - + @@ -24,7 +24,7 @@ {{item.unEntryAmount | currency:' - '}} + '}} acl [acl-ability]="['AM-LIST-unEntryAmount']"
{{item.availableBalance | currency:' '}}
diff --git a/src/app/routes/partner/account-management/components/list/list.component.ts b/src/app/routes/partner/account-management/components/list/list.component.ts index 3d98844e..d36ea25e 100644 --- a/src/app/routes/partner/account-management/components/list/list.component.ts +++ b/src/app/routes/partner/account-management/components/list/list.component.ts @@ -77,6 +77,7 @@ export class PartnerAccountManagementListComponent implements OnInit { buttons: [ { text: '虚拟账户明细', + acl: { ability: ['AM-LIST-viewVirtual'] }, click: (_record) => this.viewVirtual(_record) } ] diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts index e7420c8c..b9ad63e2 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts @@ -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) }, ] diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html index 92dc20a4..4317c033 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html @@ -10,7 +10,7 @@ class="text-right"> - +
- + 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/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index 277e01d4..9f21282a 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -82,12 +82,13 @@ const routes: Routes = [ { 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 +96,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 } ] } @@ -148,7 +163,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 } ] }, 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..c66f3589 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'] }, iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2)}, click: _record => this.viewEvaluate(_record), }, { text: '启用', + acl: { ability: ['VEHICLE-LIST-view'] }, 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 }) } ]