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:
Taric Xin
2022-05-10 09:51:53 +08:00
parent b69aaa38d5 9d13beb26c
commit 6072d2529e
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/routes/usercenter/components/driver/detail/detail.component.html
View File

@ -46,18 +46,18 @@
<a class="sign"></a> <a class="sign"></a>
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
个人信息 个人信息
<label *ngIf="userIdentityDetail?.tips" style="color: #ff4d4f"><i nz-icon nzType="info-circle" <label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1"> nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate2">
驳回原因 驳回原因
<ng-template #titleTemplate1> <ng-template #titleTemplate1>
原因 原因
</ng-template> </ng-template>
<ng-template #contentTemplate1> <ng-template #contentTemplate2>
{{userIdentityDetail?.tips}} {{userIdentityDetail?.tips}}
</ng-template> </ng-template>
</span> </span>
</label> </label>
<label *ngIf="!userIdentityDetail?.tips" style="color: #52c41a"><i nz-icon nzType="check-circle" <label *ngIf="userIdentityDetail?.certificationStatus===1" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>审核通过 nzTheme="fill" class="mr-xs"></i>审核通过
</label> </label>
</p> </p>
@ -193,7 +193,7 @@
<a class="sign"></a> <a class="sign"></a>
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
驾驶证信息 驾驶证信息
<label *ngIf="driverDetail?.tips" style="color: #ff4d4f"><i nz-icon nzType="info-circle" <label *ngIf="driverDetail?.approvalStatus===30" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1"> nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1">
驳回原因 驳回原因
<ng-template #titleTemplate1> <ng-template #titleTemplate1>
@ -204,7 +204,7 @@
</ng-template> </ng-template>
</span> </span>
</label> </label>
<label *ngIf="!driverDetail?.tips" style="color: #52c41a"><i nz-icon nzType="check-circle" <label *ngIf="driverDetail?.approvalStatus===20" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>审核通过 nzTheme="fill" class="mr-xs"></i>审核通过
</label> </label>
</p> </p>

2
src/app/routes/usercenter/components/driver/detail/detail.component.ts
View File

@ -68,6 +68,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
) {} ) {}
ngOnInit() { ngOnInit() {
console.log(this.route.snapshot.queryParams);
this.initData(); this.initData();
this.initDetailByCode(); this.initDetailByCode();
} }

10
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -62,8 +62,7 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
return params; return params;
} }
ngOnInit() { ngOnInit() {}
}
selectChange(e: any) { selectChange(e: any) {
this.resourceStatus = e; this.resourceStatus = e;
@ -306,7 +305,12 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
{ {
text: '查看<br/>', text: '查看<br/>',
click: item => { click: item => {
this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar }); this.router.navigate(['./detail', item.appUserId], {
relativeTo: this.ar,
queryParams: {
status: item.driverLicenseStatus
}
});
}, },
acl: { ability: ['USERCENTER-DRIVER-LIST-view'] } acl: { ability: ['USERCENTER-DRIVER-LIST-view'] }
}, },