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-07 17:50:02 +08:00
parent 1e7171cb23 658f1666be
commit b5ef3908e8
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/financial-management/components/refund-record/refund-record.component.ts
View File

@ -188,10 +188,7 @@ export class RefundRecordComponent implements OnInit {
type: 'string', type: 'string',
title: '所属项目', title: '所属项目',
ui: { ui: {
widget: 'select', placeholder: '请输入',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getEnterpriseProject(),
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
} }

2
src/app/routes/ticket-management/components/express-info/express-info.component.html
View File

@ -19,6 +19,6 @@
<div class="mt-md mb-sm"> <div class="mt-md mb-sm">
<button nz-button nzType="primary" (click)="printOrder()">打印面单</button> <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
</div> </div>
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}" <st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{x:'1200px'}"
(change)="stChange($event)"></st> (change)="stChange($event)"></st>
</nz-card> </nz-card>

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

@ -279,14 +279,14 @@
<sv label="自有载具"> <sv label="自有载具">
{{ carDatail?.isSelf?'否':'是' }} {{ carDatail?.isSelf?'否':'是' }}
</sv> </sv>
<sv label="行驶证照片" col="3"> <sv label="行驶证照片" col="1">
<app-imagelist [imgList]="[carDatail?.certificatePhotoFrontWatermark,carDatail?.certificatePhotoBackWatermark]"> <app-imagelist [imgList]="[carDatail?.certificatePhotoFrontWatermark,carDatail?.certificatePhotoBackWatermark]">
</app-imagelist> </app-imagelist>
</sv> </sv>
<sv label="道路运输证照片" col="3"> <sv label="道路运输证照片" col="3">
<app-imagelist [imgList]="[carDatail?.roadTransportPhotoWatermark]"></app-imagelist> <app-imagelist [imgList]="[carDatail?.roadTransportPhotoWatermark]"></app-imagelist>
</sv> </sv>
<sv label="车头照" col="3"> <sv label="车头照" col="2">
<app-imagelist [imgList]="[carDatail?.carFrontPhotoWatermark]"></app-imagelist> <app-imagelist [imgList]="[carDatail?.carFrontPhotoWatermark]"></app-imagelist>
</sv> </sv>
<nz-divider></nz-divider> <nz-divider></nz-divider>

2
src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html
View File

@ -11,7 +11,7 @@
<input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" /> <input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" />
</div> </div>
</div> </div>
<div class="map-container" id="container" tabindex="0" style="width: 100%; height: 500px"></div> <div class="map-container" id="modal-container" tabindex="0" style="width: 100%; height: 500px"></div>
<div *nzModalFooter> <div *nzModalFooter>
<button nz-button nzType="default" (click)="cancel()">取消</button> <button nz-button nzType="default" (click)="cancel()">取消</button>
<button nz-button nzType="primary" (click)="sure()">确定</button> <button nz-button nzType="primary" (click)="sure()">确定</button>

2
src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
View File

@ -74,7 +74,7 @@ export class AmapPoiPickerComponent implements OnInit {
}); });
// 地图 // 地图
this.aMap = new AMap.Map('container', { this.aMap = new AMap.Map('modal-container', {
resizeEnable: true, resizeEnable: true,
zoom: 16 zoom: 16
}); });