edit

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

@@ -35,11 +35,11 @@
         </div>
         <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
           <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-            (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 1">
+            (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
             启用
           </button>
           <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-            (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 0">
+            (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
             冻结
           </button>
           <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
@@ -86,16 +86,14 @@
       {{ detailData?.adminUserInfo?.mobile }}
     </sv>
     <sv label="身份证号">
-      {{ detailData?.contactadminUserInfo?.certificateNumber }}
+      {{ detailData?.adminUserInfo?.certificateNumber }}
     </sv>
-  </sv-container>
-  <sv-container col="2">
-    <sv label="身份证照">
+    <sv label="身份证照" col="2">
       <app-imagelist
         [imgList]="[detailData?.adminUserInfo?.certificatePhotoFrontWatermark,detailData?.adminUserInfo?.certificatePhotoBackWatermark]">
       </app-imagelist>
     </sv>
-    <sv label="企业授权函">
+    <sv label="企业授权函" col="2">
       <app-imagelist [imgList]="[detailData?.adminUserInfo?.certificatePhotoBackWatermark]"></app-imagelist>
     </sv>
   </sv-container>

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

@@ -58,6 +58,7 @@
         }
 
         .ant-form-item-control {
+          max-width  : 100% !important;
           margin-left: 20px !important;
         }
       }

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

@@ -64,15 +64,14 @@ export class FreightComponentsListNewComponent implements OnInit {
     },
     $registrationCapital: {
       spanLabelFixed: 180,
-      grid: { xxl: 13, xl: 18, lg: 24, md: 24 }
+      grid: { xxl: 13, xl: 18, lg: 22, md: 22 }
     },
     $unit: {
-      spanLabelFixed: 100,
-      grid: { span: 6 }
+      grid: { xxl: 6, xl: 6, lg: 2, md: 2 }
     },
     $isLoingDate: {
       spanLabelFixed: 100,
-      grid: { span: 6 }
+      grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
     }
   };
 
@@ -369,7 +368,7 @@ export class FreightComponentsListNewComponent implements OnInit {
           minimum: 1,
           maximum: 99999999999999999999,
           ui: {
-            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            grid: { xxl: 13, xl: 18, lg: 22, md: 22 },
             placeholder: '请输入营业执照上的注册资本',
             errors: {
               required: '请输入营业执照上的注册资本'
@@ -383,28 +382,53 @@ export class FreightComponentsListNewComponent implements OnInit {
           type: 'string',
           ui: {
             ...DATECONFIG,
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
+            errors: {
+              required: '请选择开始日期'
+            }
+          } as SFDateWidgetSchema
+        },
+        blank1: {
+          type: 'string',
+          ui: { widget: 'text', grid: { xxl: 11, xl: 6, md: 0, sm: 0 }, class: 'input-back' },
+          default: ' '
+        },
+        operatingStartTime: {
+          title: '营业期限',
+          type: 'string',
+          ui: {
+            ...DATECONFIG,
+            grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             errors: {
               required: '请选择开始日期'
             }
           } as SFDateWidgetSchema
         },
         operatingEndTime: {
-          title: '营业期限',
+          title: '',
           type: 'string',
           ui: {
             ...DATECONFIG,
+            grid: { xxl: 13, xl: 18, lg: 20, md: 18 },
             errors: {
               required: '请选择截止日期'
             },
             change: i => {
               this.sf1?.setValue('/isLoingDate', false);
+              setTimeout(() => {
+                console.log(this.sf1.value);
+              }, 1000);
             }
           } as SFDateWidgetSchema
         },
         isLoingDate: {
           title: '长期',
           type: 'boolean',
-          ui: { class: 'input-back', widget: 'checkbox', change: i => this.longTime(i, 'schema11') } as SFCheckboxWidgetSchema
+          ui: {
+            class: 'input-back',
+            widget: 'checkbox',
+            change: i => this.sf1?.setValue('/operatingEndTime', null)
+          } as SFCheckboxWidgetSchema
         },
         businessScope: {
           title: '经营范围',
@@ -543,7 +567,7 @@ export class FreightComponentsListNewComponent implements OnInit {
                 grid: { span: 6 },
                 class: 'input-back',
                 widget: 'checkbox',
-                change: i => this.longTime(i, 'schema11')
+                change: i=> this.sf1?.setValue('/legalPersonIdentityDTO/validEndTime', null),
               } as SFCheckboxWidgetSchema
             }
           },
@@ -555,7 +579,6 @@ export class FreightComponentsListNewComponent implements OnInit {
             'certificateType',
             'certificateNumber',
             'validStartTime',
-            'validEndTime'
           ]
         }
       },
@@ -568,7 +591,6 @@ export class FreightComponentsListNewComponent implements OnInit {
         'enterpriseAddress',
         'registrationCapital',
         'enterpriseRegistrationTime',
-        'operatingEndTime',
         'operatingStartTime',
         'businessScope'
       ]