车辆对接

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

@@ -3,7 +3,7 @@ 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';
+import { ContractManagementService } from '../../services/contract-management.service';
 
 @Component({
   selector: 'app-contract-management-contract-list',
@@ -25,7 +25,7 @@ export class ContractManagementContractListComponent implements OnInit {
 
   reqParams = {};
   selectedRows: any[] = [];
-  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(public service: ContractManagementService, private nzModalService: NzModalService, private router: Router) {}
 
   ngOnInit(): void {
     this.initST()

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

@@ -0,0 +1,97 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-03 11:10:14
+ * @LastEditTime: 2022-01-05 10:02:34
+ * @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\supply-management\components\vehicle\vehicle.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 *ngIf="queryFieldCount > 4">
+      <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 nzType="primary" 
+         >导出</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 >
+  <div style="margin-top: 15px;">
+    <st
+    #st
+    [bordered]="true"
+    [data]="service.$api_get_operate_listPage"
+    [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] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+    >
+    <ng-template st-row="complaintCode" let-item let-index="index">
+      <a [routerLink]="'/order-management/complaint-detail/'+item.id">{{item.complaintCode}}</a>
+    </ng-template>
+      <ng-template st-row="complainant" let-item let-index="index">
+        <div>
+          {{item?.complainant?.name}}
+        </div>
+      </ng-template>
+      <ng-template st-row="complainant" let-item let-index="index">
+        <div>
+          {{item?.complainant?.name}}
+        </div>
+      </ng-template>
+      <!-- <ng-template st-row="externalSn" let-item let-index="index">
+        <span class="mr-xs">{{111111}}</span>
+        <a (click)="editEnternalSn(item)">编辑</a>
+      </ng-template> -->
+      <ng-template st-row="enStatusStr27878" let-item let-index="index">
+        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
+      </ng-template>
+      <ng-template st-row="feiong" let-item let-index="index">
+        <div style="color: aqua;" >
+          {{item.no}}
+        </div>
+      </ng-template>
+      <ng-template #contentTemplate>
+        <div>
+          <p>预付：¥200.00</p>
+          <p>到付：¥200.00</p>
+          <p>油卡：¥200.00</p>
+          <p>回单付：¥200.00</p>
+          <p>小计：¥200.00</p>
+          <p>附加费：¥200.00</p>
+        </div>
+      </ng-template>
+    </st>
+  </div>
+</nz-card>
+<ng-template #extraTemplate>
+  <div>
+    <button  nz-button nzType="primary"(click)="creatTemplate()">
+新建
+</button> 
+  </div>
+</ng-template>

src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts

@@ -0,0 +1,32 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 14:27:59
+ * @LastEditTime: 2021-12-07 14:28:59
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\components\risk\risk.component.spec.ts
+ */
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { OrderManagementTemplateComponent } from './contract-template.component';
+
+describe('OrderManagementTemplateComponent', () => {
+  let component: OrderManagementTemplateComponent;
+  let fixture: ComponentFixture<OrderManagementTemplateComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OrderManagementTemplateComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrderManagementTemplateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,212 @@
+import { Router } from '@angular/router';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper, _HttpClient } from '@delon/theme';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { ContractManagementService } from '../../services/contract-management.service';
+
+
+@Component({
+  selector: 'app-contract-management-template-complaint',
+  templateUrl: './contract-template.component.html',
+  styleUrls: ['./contract-template.component.less']
+})
+export class OrderManagementTemplateComponent implements OnInit {
+  ui: SFUISchema = {};
+  uiView: SFUISchema = {};
+  schema: SFSchema = {};
+  schemaView: SFSchema = {};
+  auditMany = false;
+  _$expand = false;
+  channelId: any;
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  columns: STColumn[] = [];
+  datass: any = [
+    {
+    one: '1',
+    two: '1',
+    three: '1',
+    id: 1
+   },
+    {
+    one: '2',
+    two: '2',
+    three: '2',
+    id: 2
+   },
+];
+  constructor(
+    public service: ContractManagementService,
+    private modal: NzModalService,
+    private router: Router
+     ) { }
+
+  /**
+ * 查询参数
+ */
+  get reqParams() {
+    return {
+      ...this.sf?.value,
+    };
+  }
+  get selectedRows() {
+    return this.st?.list.filter((item) => item.checked) || [];
+  }
+  ngOnInit(): void {
+    this.initSF();
+    this.initST();
+    this.initSTAudit();
+  }
+
+
+
+  /**
+ * 初始化查询表单
+ */
+  initSF() {
+    this.schema = {
+      properties: {
+        complaintCode: {
+          type: 'string',
+          title: '模板名称',
+        },
+        serviceType: {
+          title: '模板类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containAllLable:true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+      },
+    };
+    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  initST() {
+    this.columns = [
+      {
+        title: '合同模板名称',
+        className: 'text-center',
+        render: 'complaintCode'
+      },
+      {
+        title: '模板类型',
+        className: 'text-center',
+        index: 'wayBillCode'
+      },
+      {
+        title: '单据类型',
+        index: 'complainantTime',
+        className: 'text-center',
+      },
+      { title: '创建人', index: 'driverId', width: '120px', className: 'text-center' },
+      {
+        title: '创建时间',
+        className: 'text-center',
+        render: 'complainant'
+      },
+      {
+        title: '操作',
+        fixed: 'right',
+        className: 'text-left',
+        buttons: [
+          {
+            text: '编辑',
+            click: (_record) => this.view(_record),
+          },
+          {
+            text: '删除',
+            click: (_record) => this.view(_record),
+          },
+        ],
+      },
+    ];
+  }
+  initSTAudit() {
+    this.schemaView = {
+      properties: {
+        handleResult: {
+          title: '处理结果',
+          type: 'string',
+          maxLength: 50,
+          ui: {
+            placeholder: '最多不超过50字',
+            widget: 'textarea',
+            autosize: { minRows: 3, maxRows: 6 }
+          },
+        },
+      },
+      required: ['handleResult']
+    };
+    this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
+  }
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+  /**
+  * 伸缩查询条件
+  */
+  expandToggle(): void {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+  tabChange(item: any) {
+    console.log(item)
+  }
+  /**
+   * 重置表单
+   */
+  resetSF(): void {
+    this.sf.reset();
+    this._$expand = false;
+  }
+ /*
+  * 审核关闭弹窗
+  view: 1
+  浮动费用： 0
+  查看评价： 3
+  */
+  handleCancel(type: string) {
+    const paramsa = {
+      handleStatus: 0,
+      id: this.channelId
+    }
+    // this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
+    //   console.log(res)
+    //   if(res) {
+    //     this.service.msgSrv.success('已拒绝！')
+    //     this.isVisibleRE = false
+    //   } else{
+    //     this.service.msgSrv.error(res?.msg)
+    //   }
+    // })
+  }
+    /**
+   /**
+  *查看评价
+  */
+  viewEvaluate(item: any) {
+    this.channelId = item.id;
+  }
+  view(value: any) {
+    this.router.navigate(['/order-management/complaint-detail/' + value.id])
+  }
+  creatTemplate() {
+    
+  }
+}

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

@@ -3,7 +3,7 @@ import { STColumn, STComponent, STChange } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { TicketService } from '../../services/contract-management.service';
+import { ContractManagementService } from '../../services/contract-management.service';
 import { Router } from '@angular/router';
 
 @Component({
@@ -26,7 +26,7 @@ export class ContractManagementPolicyComponent implements OnInit {
 
   selectedRows: any[] = [];
   paramValue = '';
-  constructor(public service: TicketService, private modal: NzModalService, private router: Router) {}
+  constructor(public service: ContractManagementService, private modal: NzModalService, private router: Router) {}
 
   /**
    * 查询参数

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

@@ -1,17 +1,19 @@
 /*
  * @Author: your name
  * @Date: 2021-12-07 15:57:49
- * @LastEditTime: 2021-12-07 16:11:00
+ * @LastEditTime: 2022-01-05 09:50:37
- * @LastEditors: your name
+ * @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\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';
+import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component';
 import { ContractManagementPolicyComponent } from './components/policy/policy.component';
 const routes: Routes = [
   { path: 'list', component: ContractManagementContractListComponent },
+  { path: 'template', component: OrderManagementTemplateComponent },
   { path: 'policy', component: ContractManagementPolicyComponent }];
 
 @NgModule({

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

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-12-07 15:57:49
- * @LastEditTime: 2021-12-07 16:11:48
+ * @LastEditTime: 2022-01-05 09:50:29
- * @LastEditors: your name
+ * @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\contract-management.module.ts
  */
@@ -12,10 +12,13 @@ import { SharedModule } from '@shared';
 import { ContractManagementManagementRoutingModule } from './contract-management-routing.module';
 import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
 import { ContractManagementPolicyComponent } from './components/policy/policy.component';
+import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component';
 
 const COMPONENTS: any = [
   ContractManagementContractListComponent,
-  ContractManagementPolicyComponent];
+  ContractManagementPolicyComponent,
+  OrderManagementTemplateComponent
+];
 const NOTROUTECOMPONENTS: any = [];
 @NgModule({
   declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],

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

@@ -1,13 +1,22 @@
+/*
+ * @Author: your name
+ * @Date: 2022-01-04 21:05:49
+ * @LastEditTime: 2022-01-05 09:51:54
+ * @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\services\contract-management.service.ts
+ */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from 'src/app/shared/services';
 
 @Injectable({
   providedIn: 'root'
 })
-export class TicketService extends BaseService {
+export class ContractManagementService extends BaseService {
 
   $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`;
-
+     // 查询投诉列表
+     $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -121,8 +121,21 @@
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
       <sv label="准驾车型">
-        <input nz-input type="text" [(ngModel)]="driverDetail.driverModel" [readonly]="!isEditDriver"
+      <nz-select
-          [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
+      [nzMaxTagCount]="3"
+      nzPlaceHolder="Please select"
+      [(ngModel)]="driverDetail.driverModel" 
+      nzMode="multiple"
+      [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
+      [nzShowArrow]="isEditDriver"
+      [nzDisabled]="!isEditDriver"
+    >
+    <nz-option
+    *ngFor="let i of contencarModel"
+    [nzLabel]="i.label"
+    [nzValue]="i.label"
+  ></nz-option>
+    </nz-select>
       </sv>
       <sv label="有效期起">
         <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver"

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -19,11 +19,12 @@ import { UsermanageService } from '../../../services/usercenter.service';
 export class UserCenterComponentsDriverDetailComponent implements OnInit {
   detailData: any;
   userDetail: any;
+  contencarModel: any;
   userIdentityDetail: any = {};
   tempalateUserIdentityDetail = { ...this.userIdentityDetail };
   driverDetail: any = {
     licenseNo: '',
-    driverModel: '',
+    driverModel: [],
     validStartTime: '',
     validEndTime: '',
     signingOrganization: '',
@@ -35,7 +36,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     validStartTime: '',
     validEndTime: '',
     certificatePhotoWatermark: '',
-    regionCode: '',
+    regionCode: ''
   };
   tempalateLicenseDetail = { ...this.licenseDetail };
   columns: STColumn[] = [
@@ -75,6 +76,12 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         this.userDetail = res;
       }
     });
+    this.service.request(this.service.$api_getDictValue, { dictKey: 'driverModel' }).subscribe(res => {
+      if (res) {
+        console.log(res);
+        this.contencarModel = res;
+      }
+    });
     // 获取用户个人信息
     this.service.request(this.service.$api_get_user_identity, { id: this.route.snapshot.params.id }).subscribe(res => {
       if (res) {
@@ -85,8 +92,10 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     // 获取驾驶证信息
     this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
       if (res?.id) {
-      console.log('driverDetail' ,res);
+        Object.assign(res, { driverModel: res.driverModel ? res.driverModel.split(',') : [] });
+        console.log('driverDetail', res);
         this.driverDetail = res;
+
         this.tempalateDriverData = { ...this.driverDetail };
       }
     });
@@ -229,7 +238,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
    */
   ratify(type: number) {
     if (type) {
-      console.log(this.driverDetail)
+      console.log(this.driverDetail);
       this.isEditDriver = true;
     } else {
       this.isEditUser = true;
@@ -250,28 +259,28 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       this.isEditUser = false;
     }
   }
-    /*
+  /*
    * 根据地区code查询地区详情
    * code：请求参数
    * type：参数 name：获取省市区名称，fullcode：获取省市区code
    * num：参数 1：第一个地区选择，2：第二个地区选择
    */
-    initDetailByCode() {
+  initDetailByCode() {
-      // 根据地区code查询地区详情
+    // 根据地区code查询地区详情
-    this.service.request(this.service.$api_get_region_by_code, { regionCode:'' }).subscribe((res: any) => {
+    this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe((res: any) => {
-      console.log(res)
+      console.log(res);
-      this.adressCodeList = res
+      this.adressCodeList = res;
-    })
+    });
-    }
+  }
 
   /**
    * 修改驾驶证，从业资格证信息
    */
   saveDriver() {
-    console.log(this.route.snapshot.params.id)
+    console.log(this.route.snapshot.params.id);
     const driverDetail = this.driverDetail;
     const licenseDetail = this.licenseDetail;
-    console.log(this.driverDetail)
+    console.log(this.driverDetail);
     const params = {
       userId: this.route.snapshot.params.id,
       mobile: this.userDetail?.phone,
@@ -280,7 +289,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         appUserId: driverDetail?.appUserId || this.route.snapshot.params.id,
         certificatePhoto: driverDetail.certificatePhoto,
         certificatePhotoWatermark: driverDetail.certificatePhotoWatermark,
-        driverModel: driverDetail.driverModel,
+        driverModel: driverDetail.driverModel.join(','),
         id: driverDetail.id,
         licenseNo: driverDetail.licenseNo,
         signingOrganization: driverDetail.signingOrganization,
@@ -311,6 +320,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
             : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd')
       }
     };
+    console.log(params)
     this.service.request(this.service.$api_update_driver_license, params).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('修改成功');

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-04 10:11:16
+ * @LastEditTime: 2022-01-05 10:30:26
  * @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\services\usercenter.service.ts
@@ -105,6 +105,8 @@ export class UsermanageService extends ShipperBaseService {
   $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense';
   // 身份证识别
   $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard';
+  // 获取字典
+  $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue';
 
   constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
     super(injector,eaCacheSrv);

src/assets/mocks/menu-data.json

@@ -387,6 +387,10 @@
               {
                 "text": "合同列表",
                 "link": "/contract-management/list"
+              },
+              {
+                "text": "合同模板",
+                "link": "/contract-management/template"
               }
             ]
           },