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

src/app/routes/usercenter/components/freight/list/new/new.component.html

@@ -52,11 +52,13 @@
     </ng-template>
 
     <ng-template sf-template="tipsD" let-me let-ui="ui" let-schema="schema">
-      <div class="pr">
+      <div class="pr"  style="z-index: 999;">
         <div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div>
         <div>上传后系统会自动识别并填写</div>
         <div></div>
-        <!-- <div class="pa"><img width="190" src="/assets/images/eg02.png" /></div> -->
+        <div class="pa"><img height="112px" style="margin-top: 12px;z-index: 9999;"
+            (click)="service.showImg('./assets/images/usercenter/agree.png')"
+            src="./assets/images/usercenter/agree.png" /></div>
       </div>
     </ng-template>
     <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">

src/app/routes/usercenter/components/freight/list/new/new.component.ts

@@ -11,10 +11,12 @@ import {
   SFUISchema,
   SFUploadWidgetSchema
 } from '@delon/form';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { of } from 'rxjs';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
 
 const IMAGECONFIG = {
-  previewFile: (file: any) => {},
+  previewFile: (file: NzUploadFile) => of(file.url),
   action: apiConf.waterFileUpload,
   fileType: 'image/png,image/jpeg,image/jpg,image/gif',
   fileSize: 5120,
@@ -26,7 +28,7 @@ const IMAGECONFIG = {
   name: 'multipartFile',
   multiple: false,
   listType: 'picture-card'
-};
+} as SFUploadWidgetSchema;
 
 const DATECONFIG = {
   grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
@@ -74,7 +76,7 @@ export class FreightComponentsListNewComponent implements OnInit {
     }
   };
 
-  constructor(private router: Router, private service: UsermanageService) {}
+  constructor(private router: Router, public service: UsermanageService) {}
   ngOnInit() {}
 
   submitForm() {