edit

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

@@ -120,9 +120,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   }
 
   View(record: any) {
-    this.router.navigate(['./view', record.id], {
+    this.router.navigate([`/usercenter/freight/enterprise/detail/${record.id}`]);
-      relativeTo: this.ar
-    });
   }
 
   // 切换Tab
@@ -137,7 +135,6 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
 
   private adminAuditUser(params: any, modal: any) {
     this.service.request(this.service.$api_audit_enterprise_admin, params, 'POST', false).subscribe(res => {
-      console.log(res);
       if (res) {
         this.service.msgSrv.success('审核成功');
         modal.destroy();

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

@@ -1,5 +1,5 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" [content]="content">
+<page-header-wrapper [logo]="logo" [content]="content" title="企业详情">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>
@@ -65,7 +65,7 @@
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证号">
-      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber" [readonly]="!isEdit"
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证照" col="2">
@@ -150,12 +150,14 @@
       </ng-template>
     </sv>
     <sv label="公司详细地址" col="2">
-      {{ detailData?.enterpriseAddress }}
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseAddress" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
   <sv-container col="1" class="mt16">
     <sv label="经营范围">
-      {{ detailData?.businessScope }}
+      <input nz-input type="text" [(ngModel)]="detailData.businessScope" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="税务机关" col="2">
       <input nz-input type="text" [(ngModel)]="detailData.taxAuthority" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -203,15 +205,14 @@
     <sv label="银行账户">
       <input nz-input type="text" [(ngModel)]="detailData.bankAccount" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
-      {{ detailData?.bankAccount }}
     </sv>
     <sv label="注册电话">
       <input nz-input type="text" [(ngModel)]="detailData.registerPhone" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
-      {{ detailData?.registerPhone }}
     </sv>
     <sv label="注册地址">
-      {{ detailData?.registerAddress }}
+      <input nz-input type="text" [(ngModel)]="detailData.registerAddress" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
 </nz-card>

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

@@ -1,12 +1,12 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" [content]="content">
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'企业详情'">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>
     </button>
   </ng-template>
   <ng-template #content>
-    <nz-skeleton [nzLoading]="service.http.loading">
+    <nz-skeleton [nzLoading]="false">
       <div class="user-info" nz-row>
         <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
           <img [src]="detailData?.enterpriseLogo" />
@@ -34,22 +34,47 @@
           </div>
         </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"
+          <ng-container *ngIf="isEdit;else editButton">
-            (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
+            <button [nzLoading]="service.http.loading" nz-button (click)="reset()">
-            启用
+              取消
-          </button>
+            </button>
-          <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
+            <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="save()">
-            (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
+              保存
-            冻结
+            </button>
-          </button>
+          </ng-container>
-          <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
+          <ng-template #editButton>
-            (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 1">
+            <ng-container *ngIf="detailData?.approvalStatus===10">
-            开通支付权限
+              <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditPass()">
-          </button>
+                通过
-          <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payenable"
+              </button>
-            (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 0">
+              <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditNo()">
-            关闭支付权限
+                驳回
-          </button>
+              </button>
+            </ng-container>
+            <ng-container *ngIf="detailData?.approvalStatus!=10">
+              <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
+                (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">
+                冻结
+              </button>
+              <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm
+                [nzPopconfirmTitle]="Payfrozen" (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight"
+                *ngIf="detailData?.createPay === 1">
+                开通支付权限
+              </button>
+              <button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm
+                [nzPopconfirmTitle]="Payenable" (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight"
+                *ngIf="detailData?.createPay === 0">
+                关闭支付权限
+              </button>
+            </ng-container>
+            <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="ratify()">
+              修改
+            </button>
+          </ng-template>
         </div>
       </div>
     </nz-skeleton>
@@ -76,27 +101,37 @@
   </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading">
+<nz-card [class]="isEdit?'edit-box':'readOnly-box'">
   <sv-container col="3">
     <sv-title>企业管理员信息</sv-title>
     <sv label="姓名">
-      {{ detailData?.adminUserInfo?.name }}
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="手机号">
-      {{ detailData?.adminUserInfo?.mobile }}
+      {{detailData.adminUserInfo?.mobile}}
     </sv>
     <sv label="身份证号">
-      {{ detailData?.adminUserInfo?.certificateNumber }}
+      <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.certificateNumber" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证照" col="2">
-      <app-imagelist
+      <div class="d-flex">
-        [imgList]="[detailData?.adminUserInfo?.certificatePhotoFrontWatermark,detailData?.adminUserInfo?.certificatePhotoBackWatermark]">
+        <ng-container
-      </app-imagelist>
+          *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'certificateBackFront'}">
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'certificateBack'}">
+        </ng-container>
+      </div>
     </sv>
     <sv label="企业授权函" col="2">
-      <app-imagelist [imgList]="[detailData?.adminUserInfo?.certificatePhotoBackWatermark]"></app-imagelist>
+      <ng-container
+        *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.adminUserInfo,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'adminPhoto'}">
+      </ng-container>
     </sv>
   </sv-container>
+
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>
@@ -112,85 +147,137 @@
       </label>
     </sv-title>
     <sv label="公司名称">
-      {{ detailData?.enterpriseName }}
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="统一社会信用代码">
-      {{ detailData?.unifiedSocialCreditCode }}
+      <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="公司类型">
-      {{ detailData?.enterpriseType }}
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseType" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="注册资本">
-      {{ detailData?.registrationCapital }}
+      <ng-container *ngIf="isEdit; else registrationCapitalTemplate">
+        <input nz-input type="number" [(ngModel)]="detailData.registrationCapital" [readonly]="!isEdit"
+          [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'" class="mr-sm">
+      </ng-container>
+      <ng-template #registrationCapitalTemplate>
+        {{detailData?.registrationCapital}}
+      </ng-template>
       <span *ngIf="detailData?.registrationCapital">万元</span>
     </sv>
     <sv label="成立日期">
-      {{ detailData?.enterpriseRegistrationTime }}
+      <nz-date-picker [(ngModel)]="detailData.enterpriseRegistrationTime" [nzDisabled]="!isEdit"
+        [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
     </sv>
     <sv label="营业期限">
-      <div *ngIf="!!detailData?.operatingStartTime && !!detailData?.operatingEndTime">
+      <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        {{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }}
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
-      </div>
+      </nz-date-picker>
-      <div *ngIf="!detailData?.operatingStartTime && !detailData?.operatingEndTime">长期</div>
+      -
-      <div *ngIf="!!detailData?.operatingStartTime && !detailData?.operatingEndTime">{{ detailData?.operatingStartTime
+      <ng-container *ngIf="!isEdit && !detailData?.operatingEndTime && detailData?.operatingStartTime">
-        }} 至 长期</div>
+        <label style="padding-left: 11px;">长期</label>
+      </ng-container>
+      <nz-date-picker [(ngModel)]="detailData.operatingEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
+      </nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
+          (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
+      </ng-container>
+
     </sv>
-  </sv-container>
-  <sv-container col="2" class="mt16">
     <sv label="公司所在地" col="3">
-      {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+      <ng-container *ngIf="isEdit; else cascaderelseTemplate">
-      detailData?.fullRegionVO?.areaName }}
+        <nz-cascader [(ngModel)]="enterpriseAddressCode" [nzLoadData]="loadRegionData">
+        </nz-cascader>
+      </ng-container>
+      <ng-template #cascaderelseTemplate>
+        {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
+        detailData?.fullRegionVO?.areaName }}
+      </ng-template>
     </sv>
-    <sv label="公司详细地址">
+    <sv label="公司详细地址" col="2">
-      {{ detailData?.enterpriseAddress }}
+      <input nz-input type="text" [(ngModel)]="detailData.enterpriseAddress" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
-  </sv-container>
+    <sv label="经营范围" col="1">
-  <sv-container col="1" class="mt16">
+      <input nz-input type="text" [(ngModel)]="detailData.businessScope" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-    <sv label="经营范围">
+        [placeholder]="isEdit?'':'-'">
-      {{ detailData?.businessScope }}
     </sv>
-  </sv-container>
+    <sv label="税务机关" col="2">
-  <sv-container col="2" class="mt16">
+      <input nz-input type="text" [(ngModel)]="detailData.taxAuthority" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-    <sv label="税务机关">
+        [placeholder]="isEdit?'':'-'">
-      {{ detailData?.taxAuthority }}
     </sv>
-    <sv label="营业执照">
+    <sv label="营业执照" col="2">
-      <app-imagelist [imgList]="[detailData?.licensePhotoWatermark]"></app-imagelist>
+      <ng-container
+        *ngTemplateOutlet="uploadTemplate;context:{data:detailData,status:isEdit,key:'licensePhotoWatermark',key2:'licensePhoto',hover:'detailPhoto'}">
+      </ng-container>
     </sv>
   </sv-container>
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>法人信息</sv-title>
     <sv label="法定代表人">
-      {{ detailData?.legalPersonIdentityVO?.name }}
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证号码">
-      {{ detailData?.legalPersonIdentityVO?.certificateNumber }}
+      <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证有效期">
-      {{ detailData?.legalPersonIdentityVO?.validStartTime }} -
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
-      {{ detailData?.legalPersonIdentityVO?.validEndTime || '长期' }}
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+        class="calendar"></nz-date-picker>
+      -
+      <ng-container
+        *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime">
+        <label style="padding-left: 11px;">长期</label>
+      </ng-container>
+      <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validEndTime" [nzDisabled]="!isEdit"
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
+        class="calendar"></nz-date-picker>
+      <ng-container *ngIf="isEdit">
+        <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentityVO.validEndTime"
+          (ngModelChange)="$event?detailData.legalPersonIdentityVO.validEndTime='':''" class="ml-sm">长期</label>
+      </ng-container>
+
     </sv>
     <sv label="身份证照" col="1">
-      <app-imagelist
+      <div class="d-flex">
-        [imgList]="[detailData?.legalPersonIdentityVO?.certificatePhotoFrontWatermark,detailData?.legalPersonIdentityVO?.certificatePhotoBackWatermark]">
+        <ng-container
-      </app-imagelist>
+          *ngTemplateOutlet="uploadTemplate;context:{data:detailData,status:isEdit,key:'licensePhotoWatermark',key2:'licensePhoto',hover:'detailPhoto'}">
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoFrontWatermark',key2:'certificatePhotoFront',hover:'legalFront'}">
+        </ng-container>
+        <ng-container
+          *ngTemplateOutlet="uploadTemplate;context:{data:detailData?.legalPersonIdentityVO,status:isEdit,key:'certificatePhotoBackWatermark',key2:'certificatePhotoBack',hover:'legalBack'}">
+        </ng-container>
+      </div>
     </sv>
   </sv-container>
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>企业开票信息</sv-title>
     <sv label="开户银行">
-      {{ detailData?.createBank }}
+      <input nz-input type="text" [(ngModel)]="detailData.createBank" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="银行账户">
-      {{ detailData?.bankAccount }}
+      <input nz-input type="text" [(ngModel)]="detailData.bankAccount" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="注册电话">
-      {{ detailData?.registerPhone }}
+      <input nz-input type="text" [(ngModel)]="detailData.registerPhone" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="注册地址">
-      {{ detailData?.registerAddress }}
+      <input nz-input type="text" [(ngModel)]="detailData.registerAddress" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
 </nz-card>
@@ -204,4 +291,55 @@
       {{content}}
     </div>
   </div>
+</ng-template>
+
+<ng-template #approvedModal>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="120">
+      <se [col]="1" label="公司名称">
+        {{ detailData?.enterpriseName }}
+      </se>
+      <se [col]="1" label="网络货运人" required>
+        <nz-select nzPlaceHolder="请选择" [(ngModel)]="networkTransporter">
+          <nz-option [nzValue]="1" nzLabel="Jack"></nz-option>
+          <nz-option [nzValue]="2" nzLabel="Lucy"></nz-option>
+        </nz-select>
+      </se>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #redectModal>
+  <div nz-row nzGutter="8">
+    <div nz-col nzSpan="24" se-container [labelWidth]="120">
+      <se [col]="1" label="公司名称">
+        {{ detailData?.enterpriseName }}
+      </se>
+      <se [col]="1" label="备注" required>
+        <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" [(ngModel)]="approvalOpinion"></textarea>
+      </se>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #uploadTemplate let-data="data" let-status="status" let-key="key" let-key2="key2" let-hover="hover">
+  <nz-upload class="avatar-uploader" [nzAction]="uploadURl" nzName="multipartFile" nzListType="picture-card"
+    [nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
+    [nzDisabled]="!isEdit || disabledUpload" (nzChange)="changeUpload($event,data,key,key2)">
+    <ng-container *ngIf="!data[key] && isEdit">
+      <i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
+      <div class="ant-upload-text">上传</div>
+    </ng-container>
+    <div *ngIf="data[key]" (mouseover)="detailData[hover]=true" (mouseleave)="detailData[hover]=false"
+      (click)="$event.cancelBubble=true" class="image-hover">
+      <img [src]="data[key]" style="width: 200px;height: 160px;" (click)="service.showImg(data[key])" />
+      <div class="mask" *ngIf="detailData[hover] && isEdit"></div>
+      <div class="mask-over" *ngIf="detailData[hover] && isEdit">
+        <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data,key,key2)"></i>
+        <div style="display: flex;align-items: center;">
+          <i nz-icon nzType="eye" nzTheme="fill" class="show-icon" (click)="service.showImg(data[key])"></i>
+        </div>
+      </div>
+    </div>
+  </nz-upload>
 </ng-template>

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

@@ -1,45 +1,21 @@
-@import '~@delon/theme/index';
+@import '../../../../less/edit.less';
-:host {
-  ::ng-deep {
-    .ant-steps-dot {
-      .ant-steps-item-content {
-        width: 200px;
-      }
-      .ant-steps-item-icon {
-        margin-left: 96px;
-      }
-      .ant-steps-item-tail::after {
-        margin-left: 40px;
-      }
-    }
-    .success {
-      color: @success-color;
-    }
 
-    .warning {
-      color: @warning-color;
-    }
 
-    .error {
+.user-info {
-      color: @error-color;
+  font-size: 16px;
-    }
+
+  .enterprise-name {
+    margin-right: 15px;
   }
-  .mt16 {
+
-    margin-top: 16px;
+  img {
+    width        : 64px;
+    height       : 64px;
+    margin-right : 15px;
+    border-radius: 50%;
   }
-  .user-info {
+
-    font-size: 16px;
+  .user-info-des {
-    .enterprise-name {
+    margin-bottom: 5px;
-      margin-right: 15px;
-    }
-    img {
-      width: 64px;
-      height: 64px;
-      margin-right: 15px;
-      border-radius: 50%;
-    }
-    .user-info-des {
-      margin-bottom: 5px;
-    }
   }
-}
+}

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

@@ -1,21 +1,43 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { apiConf } from '@conf/api.conf';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { DatePipe, ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
 import { UsermanageService } from '../../../../services/usercenter.service';
 
 @Component({
   selector: 'app-supplier-components-list-view',
   templateUrl: './detail.component.html',
-  styleUrls: ['./detail.component.less']
+  styleUrls: ['./detail.component.less'],
+  providers: [DatePipe]
 })
 export class FreightComponentsListDetailComponent implements OnInit {
-  detailData: any;
+  @ViewChild('approvedModal', { static: false })
+  approvedModal!: any;
+  @ViewChild('redectModal', { static: false })
+  redectModal!: any;
+
+  detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } };
+  tempalateData = { ...this.detailData };
   suppliersData: any = {};
 
-  constructor(public service: UsermanageService, private route: ActivatedRoute) {}
+  isEdit = false;
+
+  uploadURl = apiConf.waterFileUpload;
+  disabledUpload = false;
+  enterpriseAddressCode: any = [];
+
+  approvalOpinion = '';
+  networkTransporter = null;
+  constructor(
+    public service: UsermanageService,
+    private route: ActivatedRoute,
+    private nzModalService: NzModalService,
+    private datePipe: DatePipe
+  ) {}
 
   ngOnInit() {
     this.initData();
@@ -28,55 +50,17 @@ export class FreightComponentsListDetailComponent implements OnInit {
       .subscribe(res => {
         if (res) {
           this.detailData = res;
+          this.tempalateData = { ...this.detailData };
+          this.enterpriseAddressCode = [
+            Number(this.detailData.fullRegionVO?.provinceCode),
+            Number(this.detailData.fullRegionVO?.cityCode),
+            Number(this.detailData.fullRegionVO?.areaCode)
+          ];
         }
         console.log(res);
       });
-    // // 商品资质
-    // if (res.enterpriseBusinessJson) {
-    //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
-    // }
-    // // // 申请人身份证证件
-    // // res.applyUserJson.imagelist = [];
-    // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoFront);
-    // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoBack);
-    // // res.applyUserJson.imagelist.push(res.applyUserJson.handCertificate);
-
-    // 法人身份证证件
-    // const imagelist = [];
-    // imagelist.push(res?.certificatePhotoFront);
-    // imagelist.push(res?.certificatePhotoBack);
-    // res.certificatePhoto = imagelist;
-
-    // // 营业执照
-    // res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
-    //   ? res.enterpriseQualificationCertificate.split(',')
-    //   : [];
-
-    // // 返回所在地
-    // res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
-
-    // this.detailData = res;
-    // this.suppliersData = {
-    //   suppliersType: res?.suppliersType,
-    //   externalSuppliersId: res?.externalSuppliersId
-    // };
   }
 
-  /**
-   * 根据地区code查询地区详情
-   * @param code 地区代码
-   */
-  async getRegionFullName(code: any) {
-    const params = {
-      regionCode: code
-    };
-    const res = await this.service.asyncRequest(this.service.$api_get_one, params, 'POST', true);
-    // if (res && res.regionFullName) {
-    //   const arr = res.regionFullName.split(',');
-    //   res.regionFullName = arr.reverse().join('-');
-    // }
-    return res && res.regionFullName;
-  }
   goBack() {
     window.history.go(-1);
   }
@@ -125,4 +109,145 @@ export class FreightComponentsListDetailComponent implements OnInit {
         }
       });
   }
+
+  auditPass() {
+    this.networkTransporter = null;
+    this.nzModalService.create({
+      nzTitle: '审核通过',
+      nzContent: this.approvedModal,
+      nzOnOk: () => {
+        if (!this.networkTransporter) {
+          return false;
+        }
+        this.auditEnterprise(20);
+        return;
+      }
+    });
+  }
+  auditNo() {
+    this.approvalOpinion = '';
+    this.nzModalService.create({
+      nzTitle: '审核驳回',
+      nzContent: this.redectModal,
+      nzOnOk: () => {
+        if (!this.approvalOpinion) {
+          return false;
+        }
+        this.auditEnterprise(30);
+        return;
+      }
+    });
+  }
+
+  private auditEnterprise(status: number) {
+    this.service
+      .request(this.service.$api_audit_freight, {
+        approvalStatus: status,
+        id: this.detailData.id,
+        approvalOpinion: this.approvalOpinion,
+        networkTransporter: this.networkTransporter
+      })
+      .subscribe(res => {
+        if (res) {
+          this.service.msgSrv.success(status === 20 ? '审核通过' : '驳回成功');
+        }
+        this.initData();
+      });
+  }
+
+  ratify() {
+    this.isEdit = true;
+  }
+
+  deleteImg(data: any, key: string, key2: string) {
+    this.nzModalService.warning({
+      nzTitle: '是否确认删除该图片',
+      nzOnOk: () => {
+        this.disabledUpload = true;
+        data[key] = '';
+        data[key2] = '';
+        setTimeout(() => {
+          this.disabledUpload = false;
+        }, 100);
+      }
+    });
+  }
+  changeUpload({ file, fileList, type }: any, data: any, key: string, key2: string) {
+    if (type === 'success') {
+      data[key] = file.response.data?.fullFileWatermarkPath;
+      data[key2] = file.response.data?.fullFilePath;
+    }
+  }
+
+  /**
+   * 级联获取地区数据
+   * @param node 节点
+   * @param index 层级
+   * @returns
+   */
+  loadRegionData = (node: any, index: number) => {
+    return new Promise(resolve => {
+      this.service.request(this.service.$api_get_region_by_code, { regionCode: node?.regionCode || '' }).subscribe(
+        res => {
+          node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
+        },
+        _ => {},
+        () => {
+          resolve(node);
+        }
+      );
+    });
+  };
+
+  reset() {
+    this.detailData = { ...this.tempalateData };
+    this.isEdit = false;
+  }
+
+  save() {
+    const dateil = { ...this.detailData };
+    Object.assign(dateil.legalPersonIdentityVO, {
+      validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'),
+      validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, 'yyyy-MM-dd')
+    });
+    const params = {};
+    Object.assign(params, {
+      adminMobile: dateil.adminMobile,
+      adminAppUserId: dateil.adminAppUserId,
+      adminUserInfo: { ...dateil.adminUserInfo },
+      bankAccount: dateil.bankAccount,
+      businessScope: dateil.businessScope,
+      createBank: dateil.createBank,
+      creditPhoto: dateil.creditPhoto,
+      creditPhotoWatermark: dateil.creditPhotoWatermark,
+      enterpriseAddress: dateil.enterpriseAddress,
+      enterpriseAddressCode: this.enterpriseAddressCode[2],
+      enterpriseLogo: dateil.enterpriseLogo,
+      enterpriseName: dateil.enterpriseName,
+      enterpriseRegistrationTime: this.datePipe.transform(dateil.enterpriseRegistrationTime, 'yyyy-MM-dd'),
+      enterpriseType: dateil.enterpriseType,
+      id: dateil.id,
+      legalPersonIdentityDTO: { ...dateil.legalPersonIdentityVO },
+      licensePhoto: dateil.licensePhoto,
+      licensePhotoWatermark: dateil.licensePhotoWatermark,
+      networkTransporter: dateil.networkTransporter,
+      oftenUsedServices: dateil.oftenUsedServices,
+      operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'),
+      operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd'),
+      passTime: this.datePipe.transform(dateil.passTime, 'yyyy-MM-dd'),
+      promotersTelephone: dateil.promotersTelephone,
+      registerAddress: dateil.registerAddress,
+      registerPhone: dateil.registerPhone,
+      registrationCapital: dateil.registrationCapital,
+      taxAuthority: dateil.taxAuthority,
+      unifiedSocialCreditCode: dateil.unifiedSocialCreditCode
+    });
+    this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('企业修改成功');
+        this.initData();
+        this.isEdit = false;
+      }
+    });
+  }
 }

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

@@ -123,42 +123,6 @@ export class FreightComponentsListNewComponent implements OnInit {
     return this.service.request(this.service.$api_get_region_by_code, { regionCode });
   }
 
-  longTime(i: boolean | SFSchemaEnum[], type: string) {
-    if (type === 'schema') {
-      if (i) {
-        // this.sf?.setValue('/validStartTime', Date);
-        this.sf?.setValue('/validEndTime', Date);
-        // this.sf.getProperty('/validStartTime').schema.readOnly = true;
-        this.sf.getProperty('/validEndTime')!.schema.readOnly = true;
-      } else {
-        // this.sf.getProperty('/validStartTime').schema.readOnly = false;
-        this.sf.getProperty('/validEndTime')!.schema.readOnly = false;
-      }
-    }
-    if (type === 'schema1') {
-      if (i) {
-        // this.sf1?.setValue('/operatingStartTime', Date);
-        this.sf1?.setValue('/operatingEndTime', Date);
-        // this.sf1.getProperty('/operatingStartTime').schema.readOnly = true;
-        this.sf1.getProperty('/operatingEndTime')!.schema.readOnly = true;
-      } else {
-        // this.sf1.getProperty('/operatingStartTime').schema.readOnly = false;
-        this.sf1.getProperty('/operatingEndTime')!.schema.readOnly = false;
-      }
-    }
-    if (type === 'schema11') {
-      if (i) {
-        // this.sf1?.setValue('/validStartTime', Date);
-        this.sf1?.setValue('/validEndTime', Date);
-        // this.sf1.getProperty('/validStartTime').schema.readOnly = true;
-        this.sf1.getProperty('/validEndTime')!.schema.readOnly = true;
-      } else {
-        // this.sf1.getProperty('/validStartTime').schema.readOnly = false;
-        this.sf1.getProperty('/validEndTime')!.schema.readOnly = false;
-      }
-    }
-  }
-
   checkIdCard(imgurl: any, isFront: number, type: number) {
     // 识别身份证 参数isFront：0-正面、1-背面；type：0-申请人身份证，1-法定代表人身份证
     const params = {

src/app/routes/usercenter/less/edit.less

@@ -18,6 +18,10 @@
       nz-date-picker {
         min-width: 250px;
       }
+
+      .calendar {
+        min-width: 130px;
+      }
     }
 
     .readOnly-box {

src/app/routes/usercenter/services/usercenter.service.ts

@@ -9,6 +9,8 @@
 import { Injectable, Injector } from '@angular/core';
 import { _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 import { BaseService } from 'src/app/shared/services/core/base.service';
 import { EAFileUtil } from 'src/app/shared/utils/file.util';
 
@@ -39,7 +41,7 @@ export class UsermanageService extends BaseService {
 
   // 冻结或恢复员工
   $api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
-  
+
   // 冻结或恢复应用用户
   $api_lock_app_user = '/api/mdc/cuc/userApp/freezeOrResume';
 
@@ -84,7 +86,15 @@ export class UsermanageService extends BaseService {
   // 根据地区code查询列表
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
 
-  constructor(public injector: Injector) {
+  constructor(public injector: Injector, private nzModalService: NzModalService) {
     super(injector);
   }
+
+  showImg(url: any) {
+    const params = {
+      imgList: [url],
+      index: 0
+    };
+    this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
+  }
 }

src/app/routes/usercenter/usercenter-routing.module.ts

@@ -28,8 +28,8 @@ const routes: Routes = [
   { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
   { path: 'freight/list/new', component: FreightComponentsListNewComponent },
   { path: 'freight/list/detail/:id', component: FreightComponentsListDetailComponent },
+  { path: 'freight/enterprise/detail/:id', component: FreightComponentsListDetailComponent },
   { path: 'freight/enterprise', component: FreightComponentsEnterpriseAuditComponent },
-  { path: 'freight/enterprise/view/:id', component: FreightComponentsEnterpriseAuditViewComponent },
   { path: 'freight/user', component: FreightComponentsUserComponent },
   { path: 'freight/user/view/:id', component: FreightComponentsUserDetailComponent },
   { path: 'driver', component: UserCenterComponentsDriverComponent },