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

This commit is contained in:
Taric Xin
2022-05-10 09:51:53 +08:00
3 changed files with 15 additions and 9 deletions

View File

@ -46,18 +46,18 @@
<a class="sign"></a>
<p style="margin-bottom: 0">
个人信息
<label *ngIf="userIdentityDetail?.tips" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>驳回:<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1">
<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]="contentTemplate2">
驳回原因
<ng-template #titleTemplate1>
原因
</ng-template>
<ng-template #contentTemplate1>
<ng-template #contentTemplate2>
{{userIdentityDetail?.tips}}
</ng-template>
</span>
</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>审核通过
</label>
</p>
@ -193,7 +193,7 @@
<a class="sign"></a>
<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">
驳回原因
<ng-template #titleTemplate1>
@ -204,7 +204,7 @@
</ng-template>
</span>
</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>审核通过
</label>
</p>

View File

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

View File

@ -62,8 +62,7 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
return params;
}
ngOnInit() {
}
ngOnInit() {}
selectChange(e: any) {
this.resourceStatus = e;
@ -306,7 +305,12 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
{
text: '查看<br/>',
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'] }
},