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-02-25 17:36:39 +08:00
parent 5b2d025ee1 064fbc0113
commit 579b158b04
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@
[nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
</sv>
<sv label="准驾车型">
<nz-select [nzMaxTagCount]="3" nzPlaceHolder="Please select" [(ngModel)]="driverDetail.driverModel"
<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>

14
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -158,8 +158,18 @@
</ng-template>
</sv>
<sv label="公司类型">
<input nz-input type="text" [(ngModel)]="detailData.enterpriseType" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
<!-- <input nz-input type="text" [(ngModel)]="detailData.enterpriseType" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-select [nzMaxTagCount]="3" nzPlaceHolder="请选择" [(ngModel)]="detailData.enterpriseType"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option nzLabel="物流企业" [nzValue]="1"></nz-option>
<nz-option nzLabel="货运代理" [nzValue]="2"></nz-option>
<nz-option nzLabel="生产型企业" [nzValue]="3"></nz-option>
<nz-option nzLabel="贸易类企业" [nzValue]="4"></nz-option>
<nz-option nzLabel="科技型企业" [nzValue]="5"></nz-option>
<nz-option nzLabel="化学化工企业" [nzValue]="6"></nz-option>
<nz-option nzLabel="其他" [nzValue]="7"></nz-option>
</nz-select>
</sv>
<sv label="注册资本">
<ng-container *ngIf="isEdit; else registrationCapitalTemplate">