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:
wangshiming
2022-03-02 18:00:47 +08:00
parent b746d33dd2 b60bdb4b9d
commit 399db8c601
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,11 +223,11 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
},
acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-view'] }
},
{
text: '基础设置',
click: item => this.settingAction(item),
acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-basicSetting'] }
}
// {
// text: '基础设置',
// click: item => this.settingAction(item),
// acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-basicSetting'] }
// }
]
}
];

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

@ -47,7 +47,7 @@
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
</label>
<label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;" class="ml-md"><i nz-icon
nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回 驳回原因：{{userIdentityDetail?.certificationOpinions}}
</label>
<label *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
@ -94,6 +94,16 @@
<input nz-input type="text" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
[nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
</sv>
<sv label="有效期起">
<nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser"
[nzPlaceHolder]="isEditUser?'':'-'" [nzBorderless]="!isEditUser"
[nzSuffixIcon]="isEditUser?'calendar':''"></nz-date-picker>
</sv>
<sv label="有效期至">
<nz-date-picker [(ngModel)]="userIdentityDetail.validEndTime" [nzDisabled]="!isEditUser" dateFormat="yyyy-MM-dd"
[nzPlaceHolder]="isEditUser?'':'-'" [nzBorderless]="!isEditUser"
[nzSuffixIcon]="isEditUser?'calendar':''"></nz-date-picker>
</sv>
<sv label="身份证照" col="1">
<div class="d-flex">
<ng-container
@ -141,9 +151,9 @@
[nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
</sv>
<sv label="准驾车型">
<nz-select [nzMaxTagCount]="3" nzPlaceHolder="请选择" [(ngModel)]="driverDetail.driverModel"
nzMode="multiple" [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
[nzShowArrow]="isEditDriver" [nzDisabled]="!isEditDriver">
<nz-select [nzMaxTagCount]="3" nzPlaceHolder="请选择" [(ngModel)]="driverDetail.driverModel" nzMode="multiple"
[nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver" [nzShowArrow]="isEditDriver"
[nzDisabled]="!isEditDriver">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.label"></nz-option>
</nz-select>
</sv>
@ -318,7 +328,7 @@
</ng-container>
<div *ngIf="data[key]" (mouseover)="data[hover]=true" (mouseleave)="data[hover]=false"
(click)="$event.cancelBubble=true" class="image-hover">
<img nz-image [nzSrc]="data[key]" style="width: 200px;height: 160px;" />
<img nz-image [nzSrc]="data[key]" style="width: 200px;height: 160px;" />
<div class="mask" *ngIf="data[hover] && status"></div>
<div class="mask-over" *ngIf="data[hover] && status">
<i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data,key,key2)"></i>