edit

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

@@ -1,5 +1,5 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" [content]="content" [title]="'企业详情'" >
+<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>
@@ -44,34 +44,37 @@
           </ng-container>
           <ng-template #editButton>
             <ng-container *ngIf="detailData?.approvalStatus===10">
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 通过
               </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
+              <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl
+                [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
                 驳回
               </button>
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus!=10">
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 启用
               </button>
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"  acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
+                acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
-                [nzPopconfirmTitle]="Payfrozen" (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight"
+                (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 1">
-                *ngIf="detailData?.createPay === 1">
                 开通支付权限
               </button>
-              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
+              <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payenable"
-                [nzPopconfirmTitle]="Payenable" (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight"
+                (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 0">
-                *ngIf="detailData?.createPay === 0">
                 关闭支付权限
               </button>
             </ng-container>
-            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
+            <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl
+              [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
               修改
             </button>
           </ng-template>
@@ -172,8 +175,8 @@
       <nz-date-picker [(ngModel)]="detailData.enterpriseRegistrationTime" [nzDisabled]="!isEdit"
         [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
     </sv>
-    
+
-    <sv label="营业期限" col="1">
+    <sv label="营业期限" col="3">
       <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
         [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
       </nz-date-picker>
@@ -188,7 +191,19 @@
         <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
           (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
       </ng-container>
-
+    </sv>
+    <sv label="常用服务" col="3">
+      <ng-container *ngIf="isEdit; else oftenUsedServiceselseTemplate">
+        <nz-select [(ngModel)]="detailData.oftenUsedServices">
+          <nz-option [nzValue]="10" nzLabel="整车发货"></nz-option>
+          <nz-option [nzValue]="20" nzLabel="大宗发货"></nz-option>
+        </nz-select>
+      </ng-container>
+      <ng-template #oftenUsedServiceselseTemplate>
+        <input nz-input type="text"
+          [ngModel]="detailData.oftenUsedServices?detailData.oftenUsedServices===10?'整车发货':'大宗发货':'-'"
+          [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+      </ng-template>
     </sv>
     <sv label="公司所在地" col="3">
       <ng-container *ngIf="isEdit; else cascaderelseTemplate">
@@ -229,7 +244,7 @@
       <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
-    <sv label="身份证有效期"  col="1">
+    <sv label="身份证有效期" col="1">
       <nz-date-picker [(ngModel)]="detailData.legalPersonIdentityVO.validStartTime" [nzDisabled]="!isEdit"
         nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;"
         class="calendar"></nz-date-picker>

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

@@ -1,31 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-11-29 20:19:08
- * @LastEditTime: 2021-11-29 20:31:00
- * @LastEditors: your name
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts
- */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FreightComponentsListDetailComponent } from './detail.component';
-
-describe('FreightComponentsListDetailComponent', () => {
-  let component: FreightComponentsListDetailComponent;
-  let fixture: ComponentFixture<FreightComponentsListDetailComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FreightComponentsListDetailComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FreightComponentsListDetailComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});