merge

src/app/routes/contract-management/components/contract-list/contract-list.component.html

@@ -0,0 +1,67 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-07 15:57:49
+ * @LastEditTime: 2021-12-07 16:25:09
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html
+-->
+<page-header-wrapper [title]="'合同列表'">
+</page-header-wrapper>
+
+
+<nz-card>
+    <div nz-row nzGutter="8">
+      <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+      <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+        <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
+          (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+      </div>
+  
+      <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+      <ng-container>
+        <div nz-col [nzSpan]="_$expand ? 24 : 18">
+          <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+            (click)="st?.load(1)">查询</button>
+          <button nz-button (click)="resetSF()">重置</button>
+          <button nz-button nzType="link" (click)="expandToggle()">
+            {{ !_$expand ? '展开' : '收起' }}
+            <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+          </button>
+        </div>
+      </ng-container>
+    </div>
+  </nz-card>
+
+<nz-card class="content-box" nzBordered>
+
+    <div style="position: relative">
+        <nz-alert
+          nzType="info"
+          [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
+          nzShowIcon
+          [ngStyle]="{ margin: '0 0 1rem 0' }"
+        >
+        </nz-alert>
+      </div>
+
+    <st #st [data]="url" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st>
+</nz-card>
+
+<ng-template #auditModal>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="80">
+            <se [col]="1" label="备注">
+                <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+                    style="width: 325px;margin-left: 14px;"></textarea>
+            </se>
+        </div>
+    </div>
+</ng-template>

src/app/routes/contract-management/components/contract-list/contract-list.component.less

@@ -0,0 +1,34 @@
+:host::ng-deep {
+    .search-box {
+        .ant-card-body {
+            padding-bottom: 18px;
+        }
+    }
+
+    .content-box {
+        .ant-card-body {
+            padding-top: 0;
+        }
+    }
+
+    nz-range-picker {
+        width: 100%;
+    }
+
+    .ant-tabs-tab-btn {
+        padding-left : 16px;
+        padding-right: 16px;
+    }
+}
+
+.expend-options {
+    margin-top: 0px;
+}
+
+
+@media (min-width: 1200px) {
+    .expend-options {
+        margin-top: -40px;
+    }
+
+}

src/app/routes/contract-management/components/contract-list/contract-list.component.ts

@@ -0,0 +1,239 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { TicketService } from '../../services/contract-management.service';
+
+@Component({
+  selector: 'app-contract-management-contract-list',
+  templateUrl: './contract-list.component.html',
+  styleUrls: ['./contract-list.component.less']
+})
+export class ContractManagementContractListComponent implements OnInit {
+  url = `/rule?_allow_anonymous=true`;
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @ViewChild('auditModal', { static: false })
+  auditModal!: any;
+  schema: SFSchema = {};
+  columns: STColumn[] = [];
+  ui: SFUISchema = {};
+  _$expand = false;
+
+  reqParams = {};
+  selectedRows: any[] = [];
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {
+    this.initST()
+    this.initSF()
+  }
+  /**
+   * 初始化数据列表
+   */
+   initST() {
+    this.columns = [
+      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
+      {
+        title: '合同编号',
+        width: '100px',
+        className: 'text-center',
+        render: 'goodsId'
+      },
+      {
+        title: '合同类型',
+        width: '100px',
+        className: 'text-center',
+      },
+      { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '承运人', index: 'linkUrl', width: '120px', className: 'text-center' },
+      {
+        title: '业务单号',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '装货地',
+        className: 'text-center',
+        width: '120px',
+      }, 
+      {
+        title: '卸货地',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '货物名称',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '重量/体积',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '金额',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '签署日期',
+        className: 'text-center',
+        width: '120px',
+        render: 'feiong'
+      },
+      {
+        title: '交易时间',
+        className: 'text-center',
+        width: '120px',
+      },
+      // {
+      //   title: '操作',
+      //   fixed: 'right',
+      //   width: '200px',
+      //   className: 'text-left',
+      //   buttons: [
+      //     {
+      //       text: '查看评价',
+      //       // click: (_record) => this.viewEvaluate(_record),
+      //     },
+      //   ],
+      // },
+    ];
+  }
+    /**
+ * 初始化查询表单
+ */
+     initSF() {
+      this.schema = {
+        properties: {
+          _$expand: { type: 'boolean', ui: { hidden: true } },
+          no: {
+            type: 'string',
+            title: '用户名',
+          },
+          no2: {
+            type: 'string',
+            title: '托运人'
+          },
+          no1: {
+            type: 'string',
+            title: '承运人'
+          },
+          createTime: {
+            title: '签署日期',
+            type: 'string',
+            ui: {
+              widget: 'date',
+              mode: 'range',
+              format: 'yyyy-MM-dd',
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
+            } as SFDateWidgetSchema,
+          },
+          appId: {
+            type: 'string',
+            title: '合同类型',
+            ui: {
+              widget: 'select',
+              placeholder: '请选择',
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
+              allowClear: true,
+              // asyncData: () => this.getCatalogueMember(),
+            },
+          },
+        },
+        type: 'object',
+      };
+      this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+    }
+      /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+      case 'filter':
+        this.st.load();
+        break;
+    }
+  }
+
+  approval(): void {}
+
+  add(): void {}
+
+  routeTo(item: any) {
+    this.router.navigate(['/ticket/invoice-requested-detail/1']);
+  }
+
+  auditAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '审核',
+      nzContent: this.auditModal,
+      nzFooter: [
+        {
+          label: '拒绝',
+          type: 'default',
+          onClick: () => {
+            modal.destroy();
+          }
+        },
+        {
+          label: '通过',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+    modal.afterClose.subscribe(res => {
+      this.st.load();
+    });
+  }
+
+  showReason(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '查看原因',
+      nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
+      nzFooter: [
+        {
+          label: '关闭',
+          type: 'primary',
+          onClick: () => {
+            modal.destroy();
+          }
+        }
+      ]
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+   expandToggle(): void {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+}

src/app/routes/contract-management/contract-management-routing.module.ts

@@ -0,0 +1,20 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 15:57:49
+ * @LastEditTime: 2021-12-07 16:11: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\contract-management\contract-management-routing.module.ts
+ */
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
+const routes: Routes = [
+  { path: 'list', component: ContractManagementContractListComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ContractManagementManagementRoutingModule {}

src/app/routes/contract-management/contract-management.module.ts

@@ -0,0 +1,23 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 15:57:49
+ * @LastEditTime: 2021-12-07 16:11:48
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management.module.ts
+ */
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '@shared';
+import { ContractManagementManagementRoutingModule } from './contract-management-routing.module';
+import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
+
+const COMPONENTS: any = [
+  ContractManagementContractListComponent
+];
+const NOTROUTECOMPONENTS: any = [];
+@NgModule({
+  declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
+  imports: [CommonModule, ContractManagementManagementRoutingModule, SharedModule]
+})
+export class ContractManagementManagementModule {}

src/app/routes/contract-management/services/contract-management.service.ts

@@ -0,0 +1,11 @@
+import { Injectable, Injector } from '@angular/core';
+import { BaseService } from 'src/app/shared/services';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TicketService extends BaseService {
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 10:20:33
- * @LastEditTime: 2021-12-07 14:57:47
+ * @LastEditTime: 2021-12-07 16:12:50
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\routes-routing.module.ts
@@ -42,6 +42,7 @@ const routes: Routes = [
       { path: 'order-management', loadChildren: () => import('./order-management/order-management.module').then((m) => m.OrderManagementModule) },
       { path: 'waybill-management', loadChildren: () => import('./waybill-management/waybill-management.module').then((m) => m.WaybillManagementModule) },
       { path: 'financial-management', loadChildren: () => import('./financial-management/financial-management.module').then((m) => m.FinancialManagementModule) },
+      { path: 'contract-management', loadChildren: () => import('./contract-management/contract-management.module').then((m) => m.ContractManagementManagementModule) },
     ]
   },
   // passport

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -6,7 +6,7 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { UsermanageService } from '../../../vehicle/services/vehicle.service';
 @Component({
   selector: 'app-Freight-components-list',
-  templateUrl: './list.component.html',
+  templateUrl: './audit.component.html',
 })
 export class VehicleComponentsListComponent implements OnInit {
   _$expand = false;

src/app/routes/vehicle/components/list/detail/detail.component.html

@@ -1,32 +1,40 @@
 <ng-container >
   <!-- 页头 -->
-  <page-header-wrapper [logo]="logo" [content]="content">
+  <page-header-wrapper [logo]="logo" title="车辆详情" [content]="content">
     <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>
-      <div class="user-info">
+        <sv-container col="3">
-        <div style="flex: 1">
+        <sv-title style="font-weight: 700;">车辆基础信息</sv-title>
-         <div style="display: flex;">
+          <sv label="车牌号">
-          <p style="padding-right: 80px; width: 400px;">车牌号{{ detailData?.shoppFeignVO?.publicity }}</p>
+            {{ detailData?.contactsName }}
-          <p style="padding-right: 80px; width: 400px;">车牌颜色{{ detailData?.shoppFeignVO?.introduction }}</p>
+          </sv>
-          <p >注册日期：2021-09-02 12.53.32</p>
+          <sv label="车牌颜色">
-         </div>
+            {{ detailData?.contactsPhone }}
-         <div style="display: flex;">
+          </sv>
-          <p style="padding-right: 80px; width: 400px;">车型{{ detailData?.shoppFeignVO?.introduction }}</p>
+          <sv label="车型">
-          <p >车长：2021-09-02 12.53.32</p>
+            {{ detailData?.contactsPhone }}
-         </div>
+          </sv>
-        
+          <sv label="车长">
-   
+            {{ detailData?.contactsPhone }}
-        </div>
+          </sv>
-      </div>
+          <sv label="是否为挂车">
+            {{ detailData?.contactsPhone }}
+          </sv>
+        </sv-container>
+        <sv-container col="1">
+          <sv label="车头照">
+            <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+          </sv>
+        </sv-container>
     </ng-template>
   </page-header-wrapper>
   <nz-card>
     <sv-container col="3">
-      <sv-title>行驶证信息</sv-title>
+      <sv-title style="font-weight: 700;">行驶证信息</sv-title>
       <sv label="档案编号">
         {{ detailData?.contactsName }}
       </sv>
@@ -80,7 +88,7 @@
     </sv-container>
     <nz-divider></nz-divider>
     <sv-container col="3" class="mt16">
-      <sv-title>道路运输证信息</sv-title>
+      <sv-title style="font-weight: 700;">道路运输证信息</sv-title>
       <sv label="道路运输证号">
         {{ detailData?.enterpriseName }}
       </sv>
@@ -96,15 +104,8 @@
     </sv-container>
     <nz-divider></nz-divider>
     <sv-container col="2" class="mt16">
-      <sv-title>其他信息</sv-title>
+      <sv-title style="font-weight: 700;">认证司机</sv-title>
-      <sv label="车头照">
-        {{ detailData?.name }}
-      </sv>
-      <sv label="车主申明或挂靠协议" >
-        <!-- <app-imagelist [imgList]="detailData?.certificatePhoto"></app-imagelist> -->
-      </sv>
     </sv-container>
-    <nz-divider></nz-divider>
     <st
     #st
     [bordered]="true"

src/app/routes/vehicle/components/list/detail/detail.component.ts

@@ -5,6 +5,8 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { UsermanageService } from '../../../services/vehicle.service';
+import { VehicleComponentsListEditComponent } from '../edit/edit.component';
+import { VehicleImgViewComponent } from '../img-view/img-view.component';
 
 @Component({
   selector: 'app-supplier-components-list-view',
@@ -23,7 +25,24 @@ export class VehicleComponentsListDetailComponent implements OnInit {
   columns: STColumn[] = [
     { title: '认证司机', index: 'perPrice', width: 300, className: 'text-center' },
     { title: '司机手机号', index: 'goodsQuantity', width: 300, className: 'text-center' },
+    { title: '是否挂靠', index: 'goodsQuantity', width: 300, className: 'text-center' },
     { title: '录入人员', index: 'totalPrice', width: 300, className: 'text-center' },
+    {
+      title: '车主申明/挂靠协议',
+      fixed: 'right',
+      width: '200px',
+      className: 'text-left',
+      buttons: [
+        {
+          text: '查看协议',
+          click: (_record) => this.viewEvaluate(_record),
+        },
+        {
+          text: '上传协议',
+          click: (_record) => this.updateEvaluate(_record),
+        },
+      ],
+    },
   ];
   detailData: any = {
     goodsList: [
@@ -122,152 +141,70 @@ export class VehicleComponentsListDetailComponent implements OnInit {
       required: this.validData,
     };
   }
-  showModal(name: any) {
+  // async initData() {
-    this.modalName = name;
+  //   console.log(this.route.snapshot, 'this.route.snapshot');
-    if (name === 'effectiveDate') {
-      this.isShow = true;
-    } else {
-      this.isVisible = true;
-    }
-  }
-  async initData() {
-    console.log(this.route.snapshot, 'this.route.snapshot');
 
-    const params = {
+  //   const params = {
-      tenantId: this.route.snapshot.params.id,
+  //     tenantId: this.route.snapshot.params.id,
-      // tenantId: this.route.snapshot.queryParams.tenantId,
+  //     // tenantId: this.route.snapshot.queryParams.tenantId,
-    };
+  //   };
-    const res = await this.service.asyncRequest(this.service.$api_get_supplier_info, params);
+  //   const res = await this.service.asyncRequest(this.service.$api_get_supplier_info, params);
-    // // 商品资质
+  //   // // 商品资质
-    // if (res.enterpriseBusinessJson) {
+  //   // if (res.enterpriseBusinessJson) {
-    //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
+  //   //   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,
+  //   };
   // }
-    // // // 申请人身份证证件
-    // // 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_region_detailByCode, params, 'POST', true);
-    // if (res && res.regionFullName) {
-    //   const arr = res.regionFullName.split(',');
-    //   res.regionFullName = arr.reverse().join('-');
-    // }
-    return res && res.regionFullName;
-  }
-  add() {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
-  }
   goBack() {
     window.history.go(-1);
   }
-  /**
+ 
-   * 冻结
-   */
-  freezeOrResume(type: number) {
-    console.log(type)
-    // this.service.http
-    //   .post(this.service.$api_set_freezeOrResume, {
-    //     tenantId: this.route.snapshot.params.id,
-    //     // tenantId: this.route.snapshot.queryParams.tenantId,
-    //     status: type,
-    //   })
-    //   .subscribe((res) => {
-    //     if (res.data === true) {
-    //       if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
-    //       } else if (type === 1) {
-    //         this.service.msgSrv.success(`冻结成功！`);
-    //       }
-    //       this.ngOnInit();
-    //     } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
-    //   });
-  }
-  PayOrResume(type: number) {
-    console.log(type)
-    // this.service.http
-    //   .post(this.service.$api_set_freezeOrResume, {
-    //     tenantId: this.route.snapshot.params.id,
-    //     // tenantId: this.route.snapshot.queryParams.tenantId,
-    //     status: type,
-    //   })
-    //   .subscribe((res) => {
-    //     if (res.data === true) {
-    //       if (type === 0) {
-    //         this.service.msgSrv.success(`启用成功！`);
-    //       } else if (type === 1) {
-    //         this.service.msgSrv.success(`冻结成功！`);
-    //       }
-    //       this.ngOnInit();
-    //     } else {
-    //       this.service.msgSrv.error(res.msg || '操作失败！');
-    //     }
-    //   });
-  }
 
   handleCancel(name: any) {
-    if (name === 'effectiveDate') {
-      this.isShow = false;
-    } else {
-      this.isVisible = false;
-    }
-  }
-  handleOK(name: any) {
-    const params: any = {
-      tenantId: this.route.snapshot.params.id,
-      // tenantId: this.route.snapshot.queryParams.tenantId,
-    };
 
-    if (name === 'effectiveDate') {
-      params.effectiveDate = this.sf?.value?.effectiveDate;
-    } else {
-      Object.assign(params, this.sf1?.value);
   }
-    this.service.http.post(this.service.$api_set_freezeOrResume, params).subscribe((res) => {
+
-      if (res.data === true) {
+  /**
-        this.service.msgSrv.success(`编辑成功！`);
+  *查看评价
-        this.ngOnInit();
+  */
-      } else {
+  viewEvaluate(item: any) {
-        this.service.msgSrv.error(res.msg || '编辑失败！');
+    this.modal.createStatic(VehicleImgViewComponent, { i: { imgUrl: item } }).subscribe(() => {
-      }
+      // this.st.reload();
-      if (name === 'effectiveDate') {
+    });
-        this.isShow = false;
-      } else {
-        this.isVisible = false;
   }
+  /**
+  *查看评价
+  */
+  updateEvaluate(item: any) {
+    this.modal.createStatic(VehicleComponentsListEditComponent, { i: { item }, infoData: item }).subscribe(() => {
+      // this.st.reload();
+      // this.getInfo();
     });
   }
 }

src/app/routes/vehicle/components/list/edit/edit.component.html

@@ -0,0 +1,20 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-07 17:20:23
+ * @LastEditTime: 2021-12-07 17:22:40
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\edit\edit.component.html
+-->
+<div class="modal-header">
+  <div class="modal-title">{{ i.typeName }}</div>
+</div>
+<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
+<div>
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="formData">
+  </sf>
+</div>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">取消</button>
+  <button nz-button type="button" nzType="primary" (click)="sure()" [disabled]="!sf?.valid" [nzLoading]="service.http.loading">确定</button>
+</div>

src/app/routes/vehicle/components/list/edit/edit.component.spec.ts

@@ -0,0 +1,23 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { UcenterComponentsInfoEditComponent } from './edit.component';
+
+describe('UcenterComponentsInfoEditComponent', () => {
+  let component: UcenterComponentsInfoEditComponent;
+  let fixture: ComponentFixture<UcenterComponentsInfoEditComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [UcenterComponentsInfoEditComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UcenterComponentsInfoEditComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/vehicle/components/list/edit/edit.component.ts

@@ -0,0 +1,129 @@
+import { Component, OnInit, ViewChild, Type } from '@angular/core';
+import { SFComponent, SFSchema, SFUISchema, SFUploadWidgetSchema, SFTextareaWidgetSchema } from '@delon/form';
+import { EAEnvironmentService, CaptchaComponent, EAUserService } from '@shared';
+import { Observable, Observer } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { UsermanageService } from '../../../services/vehicle.service';
+@Component({
+  selector: 'app-setting-components-info-edit',
+  templateUrl: './edit.component.html',
+})
+export class VehicleComponentsListEditComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  record: any = {};
+  i: any = {};
+  infoData: any = {};
+  schema!: SFSchema;
+  ui!: SFUISchema;
+  formData: any = {};
+  interval$: any;
+  phone!: string;
+
+  constructor(
+    private modal: NzModalRef,
+    public msgSrv: NzMessageService,
+    public service: UsermanageService,
+    private envSrv: EAEnvironmentService,
+  ) {}
+
+  ngOnInit(): void {
+    console.log('init:', this.i, this.infoData);
+    // 设置初始值
+    this.initInfo();
+    this.initSF();
+  }
+  initInfo() {
+        if (this.infoData.enterpriseLogo) {
+          this.formData = {
+            enterpriseLogo: [
+              {
+                uid: 'logo',
+                name: 'LOGO',
+                status: 'done',
+                url: this.infoData.enterpriseLogo,
+                response: {
+                  url: this.infoData.enterpriseLogo,
+                },
+              },
+        ],
+          };
+        }
+  }
+  initSF() {
+    // 依据类型初始表单
+    this.schema = {
+      properties: {
+        enterpriseLogo: {
+          type: 'string',
+          title: 'Logo',
+          ui: {
+            widget: 'upload',
+            action: `/cms/upload/multipartFile/fileModel`,
+            // fileType: 'image/png,image/jpeg,image/gif,image/bmp',
+            limit: 1,
+            limitFileCount: 1,
+            resReName: 'url',
+            urlReName: 'url',
+            descriptionI18n: '支持JPG、GIF、PNG、JPEG格式，图片小于2M',
+            data: {
+              appId: this.envSrv.env.appId,
+            },
+            name: 'multipartFile',
+            change: (args) => {
+              if (args.type === 'success') {
+                const avatar = [
+                  {
+                    uid: 'logo',
+                    name: 'LOGO',
+                    status: 'done',
+                    url: args.fileList[0].response.url,
+                    response: {
+                      url: args.fileList[0].response.url,
+                    },
+                  },
+                ];
+                this.sf?.setValue('/enterpriseLogo', avatar);
+              }
+            },
+            beforeUpload: (file: any, fileList: any) => {
+              return new Observable((observer: Observer<boolean>) => {
+                const isLt1M = file.size / 1024 / 1024 < 2;
+                const fileType = 'image/png,image/jpeg';
+                if (fileType.indexOf(file.type) === -1) {
+                  this.service.msgSrv.warning('图片格式不正确！');
+                  observer.complete();
+                  return;
+                }
+                if (!isLt1M) {
+                  this.service.msgSrv.warning('图片大小超过2M!');
+                  observer.complete();
+                  return;
+                }
+                observer.next(isLt1M);
+                observer.complete();
+              });
+            },
+            multiple: false,
+            listType: 'picture-card',
+            showRequired: true,
+          } as SFUploadWidgetSchema,
+        },
+      },
+      required: ['enterpriseLogo'],
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 120,
+        grid: { span: 24 },
+      },
+    };
+  }
+
+  close() {
+    this.modal.destroy();
+  }
+  sure() {
+   
+  }
+}

src/app/routes/vehicle/components/list/img-view/img-view.component.html

@@ -0,0 +1,18 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-07 17:30:18
+ * @LastEditTime: 2021-12-07 17:32:06
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.html
+-->
+<div class="modal-header">
+  <div class="modal-title">查看协议</div>
+</div>
+<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
+<div class="text-center"><img [src]="i.imgUrl" /></div>
+<style>
+  .text-center img {
+    max-width: 100%;
+  }
+</style>

src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts

@@ -0,0 +1,23 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SettingComponentsInfoImgViewComponent } from './img-view.component';
+
+describe('SettingComponentsInfoImgViewComponent', () => {
+  let component: SettingComponentsInfoImgViewComponent;
+  let fixture: ComponentFixture<SettingComponentsInfoImgViewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SettingComponentsInfoImgViewComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SettingComponentsInfoImgViewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/vehicle/components/list/img-view/img-view.component.ts

@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+
+@Component({
+  selector: 'app-setting-components-info-img-view',
+  templateUrl: './img-view.component.html',
+})
+export class VehicleImgViewComponent implements OnInit {
+  record: any = {};
+  i: any;
+
+  constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public http: _HttpClient) {}
+
+  ngOnInit(): void {
+    console.log(this.i.imgUrl, 66666666666);
+
+    // this.http.get(`/user/${this.record.id}`).subscribe(res => this.i = res);
+  }
+
+  close() {
+    this.modal.destroy();
+  }
+}

src/app/routes/vehicle/components/list/list.component.ts

@@ -155,7 +155,7 @@ export class VehicleComponentsListComponent implements OnInit {
         },
       },
     };
-    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
   }
 
   initST() {
@@ -164,7 +164,6 @@ export class VehicleComponentsListComponent implements OnInit {
       { title: '车牌号', className: 'text-center', index: 'storeName' },
       { title: '车牌颜色', className: 'text-center', index: 'contactsName' },
       { title: '车型-车长-载重', className: 'text-center', render: 'enterpriseName' },
-      { title: '承运总单量', className: 'text-center', index: 'unifiedSocialCreditCode' },
       { title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
       type: 'badge',
       badge: {

src/app/routes/vehicle/vehicle.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-01 20:36:45
+ * @LastEditTime: 2021-12-07 17:30:51
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\usercenter\usercenter.module.ts
@@ -9,13 +9,17 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared';
 import { VehicleComponentsListDetailComponent } from './components/list/detail/detail.component';
+import { VehicleComponentsListEditComponent } from './components/list/edit/edit.component';
+import { VehicleImgViewComponent } from './components/list/img-view/img-view.component';
 import { VehicleComponentsListComponent } from './components/list/list.component';
 import { VehicleRoutingModule } from './vehicle-routing.module';
 
 
 const COMPONENTS = [
   VehicleComponentsListComponent,
-  VehicleComponentsListDetailComponent
+  VehicleComponentsListDetailComponent,
+  VehicleComponentsListEditComponent,
+  VehicleImgViewComponent
 ];
 
 @NgModule({

src/assets/mocks/menu-data.json

@@ -278,12 +278,12 @@
           ]
         },
         {
-          "text": "车辆管理",
+          "text": "运力管理",
           "icon": "anticon anticon-dashboard",
           "group": true,
           "children": [
             {
-              "text": "车辆列表",
+              "text": "车辆管理",
               "link": "/vehicle/list"
             },
             {
@@ -325,6 +325,17 @@
             }
           ]
         },
+        {
+          "text": "合同管理",
+          "icon": "anticon anticon-dashboard",
+          "group": true,
+          "children": [
+            {
+              "text": "合同列表",
+              "link": "/contract-management/list"
+            }
+          ]
+        },
         {
           "text": "系统设置",
           "icon": "anticon anticon-dashboard",