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

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

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

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

@@ -19,6 +19,6 @@
     <div class="mt-md mb-sm">
         <button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
     </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>
 </nz-card>

src/app/routes/usercenter/components/driver/detail/detail.component.html

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

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

@@ -11,7 +11,7 @@
     <input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" />
   </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>
   <button nz-button nzType="default" (click)="cancel()">取消</button>
   <button nz-button nzType="primary" (click)="sure()">确定</button>

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

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