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 16:23:23 +08:00
parent 23d6ad6150
commit 1f9af1e116
12 changed files with 75 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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]="['VEHICLE-LIST-search']">导出</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]="['VEHICLE-LIST-search']">新增</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: ['VEHICLE-LIST-view'] },
click: _record => 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),
},

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