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

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.html

@@ -1,5 +1,16 @@
 <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema">
     <ng-template sf-template="creditPhoto" let-me let-ui="ui" let-schema="schema">
-        <img [src]="me.formProperty.value" alt="" style="width: 200px;height: 160px;"/>
+        <img [src]="me.formProperty.value" alt="" style="width: 200px;height: 160px;"
+            (click)="show(me.formProperty.value)" />
+    </ng-template>
+    <ng-template sf-template="newPhotoFrontWatermark" let-me let-ui="ui" let-schema="schema">
+        <div style="display: flex;">
+            <img [src]="me.formProperty.value.newPhotoFrontWatermark" alt=""
+                style="width: 200px;height: 160px;cursor: pointer;"
+                (click)="show(me.formProperty.value.newPhotoFrontWatermark)" />
+            <img [src]="me.formProperty.value.newPhotoBackWatermark" alt=""
+                style="width: 200px;height: 160px;cursor: pointer;" class="ml-sm"
+                (click)="show(me.formProperty.value.newPhotoBackWatermark)" />
+        </div>
     </ng-template>
 </sf>

src/app/routes/usercenter/components/freight/enterprise-audit/audit-admin/audit-admin.component.ts

@@ -1,7 +1,9 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
+import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 
 @Component({
   selector: 'app-audit-admin',
@@ -20,7 +22,7 @@ export class AuditAdminComponent implements OnInit {
     }
   };
   isReadOnly = false;
-  constructor(public msgSrv: NzMessageService, public service: UsermanageService) {}
+  constructor(public msgSrv: NzMessageService, private nzModalService: NzModalService, public service: UsermanageService) {}
 
   ngOnInit(): void {
     this.loadUserInfo();
@@ -34,8 +36,19 @@ export class AuditAdminComponent implements OnInit {
     });
   }
 
+  show(src: string) {
+    if (!src) {
+      return;
+    }
+    const params = {
+      imgList: [src],
+      index: 0
+    };
+    this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
+  }
+
   initSF(user?: any) {
-    console.log(user);
+    // console.log(user);
 
     this.schema = {
       properties: {
@@ -76,6 +89,12 @@ export class AuditAdminComponent implements OnInit {
           ui: { widget: 'text' },
           default: user.newAdminIdNo
         },
+        newPhotoFrontWatermark: {
+          title: '身份证照',
+          type: 'string',
+          ui: { widget: 'custom' },
+          default: user
+        },
         creditPhoto: {
           title: '企业授权函',
           type: 'string',

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -69,7 +69,9 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
    */
   ViewAdimin(record: any, isReadOnly = false) {
     const modal = this.modal.create({
+      nzTitle: isReadOnly ? '查看' : '审核',
       nzContent: AuditAdminComponent,
+      nzWidth: 650,
       nzComponentParams: { i: { ...record }, isReadOnly },
       nzFooter: isReadOnly
         ? []