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

src/app/routes/sys-setting/components/network-freight/new/new.component.html

@@ -4,13 +4,22 @@
  * @Author       : Shiming
  * @Date         : 2022-02-17 15:01:33
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-18 14:34:32
+ * @LastEditTime : 2022-02-22 11:17:30
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="TabText"></page-header-wrapper>
 <nz-card>
   <sf #sf1 [ui]="ui" [schema]="schema1" [formData]="sf1FormData" [button]="'none'">
+    <ng-template sf-template="tipsS" let-me let-ui="ui" let-schema="schema">
+      <div class="pr">
+        <dl class="tips">
+          <dt>正面照</dt>
+          <dd>示例</dd>
+        </dl>
+        <div class="pa2"> <app-imagelist [imgList]="['./assets/images/company.png']"></app-imagelist></div>
+      </div>
+    </ng-template>
     <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
       <div class="form-title">企业基本信息</div>
     </ng-template>
@@ -27,6 +36,7 @@
     <ng-template sf-template="legalPersonIdentityVO/title2" let-me let-ui="ui" let-schema="schema">
       <div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
     </ng-template>
+    
     <ng-template sf-template="legalPersonIdentityVO/tipsC" let-me let-ui="ui" let-schema="schema">
       <div class="pr">
         <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>

src/app/routes/sys-setting/components/network-freight/new/new.component.less

@@ -5,14 +5,17 @@
       .pr {
         position: relative;
       }
-
       .pa {
         position: absolute;
         top     : 50px;
         left    : 150px;
       }
-
-      .tips {
+      .pa2 {
+        position: absolute;
+        top: 28px;
+        left: 180px;
+      }
+       .tips {
         display      : flex;
         margin-bottom: 0;
         color        : #333;

src/app/routes/sys-setting/components/network-freight/new/new.component.ts

@@ -297,6 +297,7 @@ export class NetworkFreightNewComponent implements OnInit {
         title1: { title: '', type: 'string', ui: { widget: 'custom' } },
         tips: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
         licensePhoto: { title: '', type: 'string', ui: { hidden: true } },
+        tipsS: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
         licensePhotoWatermark: {
           type: 'string',
           title: '营业执照',
@@ -311,6 +312,7 @@ export class NetworkFreightNewComponent implements OnInit {
             }
           } as SFUploadWidgetSchema
         },
+     
         enterpriseName: {
           title: '公司名称',
           type: 'string',