车辆对接

2022-01-13 15:43:45 +08:00
parent 5bf20e71c1
commit be43d47341
9 changed files with 63 additions and 33 deletions
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-12 14:18:32
+ * @LastEditTime: 2022-01-13 15:38: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\usercenter\components\freight\list\list.component.html
@ -50,13 +50,13 @@
  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'>
  <nz-tab [nzTitle]="'全部'"></nz-tab>
  <nz-tab [nzTitle]="'待审核'"></nz-tab>
-  <nz-tab [nzTitle]="'未提交'"></nz-tab>
  <nz-tab [nzTitle]="'审核通过'"></nz-tab>
  <nz-tab [nzTitle]="'驳回'"></nz-tab>
 </nz-tabset>
  <st
    #st
    [bordered]="true"
+    [scroll]="{ x: '1200px' }"
    [columns]="columns"
    [data]='service.$api_get_userCarLicense_list'
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@ -37,12 +37,10 @@ export class VehicleComponentsAuditComponent implements OnInit {
    if(this.resourceStatus === 1) {
      a.approvalStatus = 10
    } else if(this.resourceStatus === 2) {
-      a.approvalStatus = -1
-    } else if(this.resourceStatus === 3) {
      a.approvalStatus = 20
-    } else if(this.resourceStatus === 4) {
+    } else if(this.resourceStatus === 3) {
      a.approvalStatus = 30
-    }
+    } 
    return {
      ...a,
      ...this.sf?.value,
@ -155,16 +153,17 @@ export class VehicleComponentsAuditComponent implements OnInit {
  initST() {
    this.columns = [
      // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '车牌号', className: 'text-center', index: 'carNo' },
-      { title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
-      { title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
-      { title: '是否挂靠', className: 'text-center', render: 'isSelf' },
-      { title: '所有人', className: 'text-center', index: 'carOwner' },
-      { title: '录入人员', className: 'text-center', index: 'saveUser', },
+      { title: '车牌号',  width:'180px', className: 'text-center', index: 'carNo' },
+      { title: '车牌颜色',  width:'180px', className: 'text-center', index: 'carNoColorLabel' },
+      { title: '车型-车长-载重',   width:'180px',className: 'text-center', render: 'carLength' },
+      { title: '是否挂靠',  width:'180px', className: 'text-center', render: 'isSelf' },
+      { title: '所有人',  width:'180px', className: 'text-center', index: 'carOwner' },
+      { title: '录入人员',  width:'180px', className: 'text-center', index: 'saveUser', },
      {
        title: '审核状态',
        className: 'text-center',
        index: 'approvalStatus',
+        width:'180px',
        type: 'badge',
        badge: {
          '-1': { text: '未上传', color: 'default' },
@ -176,11 +175,12 @@ export class VehicleComponentsAuditComponent implements OnInit {
          40: { text: '证件过期', color: 'error' },
        },
      },
-      { title: '申请时间', className: 'text-center', index: 'createTime' },
+      { title: '申请时间',  width:'180px', className: 'text-center', index: 'createTime' },
      {
        title: '操作',
-        width: '170px',
-        className: 'text-center',
+        fixed: 'right',
+        width: '100px',
+        className: 'text-left',
        buttons: [
          {
            text: '查看',
@ -194,10 +194,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
    ];
  }
  selectChange(e: number) {
-    console.log(e);
-    if(e>=1) {
    this.resourceStatus = e;
-    }
    this.initST();
    setTimeout(() => {
      this.st.load();
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-12 13:54:01
+ * @LastEditTime: 2022-01-13 15:35:25
 * @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\components\freight\list\list.component.html
@ -34,7 +34,7 @@
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
        <button nz-button nzType="primary"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="st?.load(1)">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="export()">导出</button>
        <button nz-button  [disabled]="service.http.loading"(click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -51,6 +51,7 @@
  <st
    #st
    [bordered]="true"
+    [scroll]="{ x: '1200px' }"
    [columns]="columns"
    [data]='service.$api_get_operate_list'
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -217,10 +217,10 @@ export class VehicleComponentsListComponent implements OnInit {
  initST() {
    this.columns = [
      // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '车牌号', className: 'text-center', index: 'carNo' },
-      { title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
-      { title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
-      { title: '运营状态', className: 'text-center', index: 'carStatus',
+      { title: '车牌号', width:'150px', className: 'text-center', index: 'carNo' },
+      { title: '车牌颜色', width:'150px',  className: 'text-center', index: 'carNoColorLabel' },
+      { title: '车型-车长-载重',width:'150px',  className: 'text-center', render: 'carLength' },
+      { title: '运营状态',width:'150px',  className: 'text-center', index: 'carStatus',
      type: 'badge',
      badge: {
        true: { text: '运输中', color: 'success' },
@ -229,6 +229,7 @@ export class VehicleComponentsListComponent implements OnInit {
     },
      {
        title: '行驶证到期状态',
+        width:'180px',
        className: 'text-center',
        index: 'driverLicenseStatus',
        type: 'badge',
@ -240,6 +241,7 @@ export class VehicleComponentsListComponent implements OnInit {
      },
      {
        title: '道运证到期状态',
+        width:'180px',
        className: 'text-center',
        index: 'roadTransportStatus',
        type: 'badge',
@ -249,15 +251,16 @@ export class VehicleComponentsListComponent implements OnInit {
          3: { text: '已到期', color: 'error' },
        },
      },
-      { title: '所有人', className: 'text-center', index: 'carOwner' },
-      { title: '是否挂靠', className: 'text-center', render: 'isSelf', },
-      { title: '挂靠协议', className: 'text-center', render: 'approvalAuditStatus' },
+      { title: '所有人',width:'150px',  className: 'text-center', index: 'carOwner' },
+      { title: '是否挂靠', width:'150px', className: 'text-center', render: 'isSelf', },
+      { title: '挂靠协议', width:'150px', className: 'text-center', render: 'approvalAuditStatus' },
      // { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },

      {
        title: '操作',
-        width: '170px',
-        className: 'text-center',
+        fixed: 'right',
+        width: '100px',
+        className: 'text-left',
        buttons: [
          {
            text: '查看',
@ -294,4 +297,8 @@ export class VehicleComponentsListComponent implements OnInit {
    this.sf.reset();
    this._$expand = false;
  }
+  // 导出
+  export() {
+ this.service.downloadFile(this.service.$api_carLicense_export, );
+  }
 }
--- a/src/app/routes/vehicle/services/vehicle.service.ts
+++ b/src/app/routes/vehicle/services/vehicle.service.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-17 17:17:17
+ * @LastEditTime: 2022-01-13 15:37:22
 * @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
@ -50,6 +50,9 @@ export class VehicleService extends BaseService {
  // 根据车牌号查询车辆信息（车辆审核认证表）
  $api_get_getCarLicenseListByCarNo_audit= `/api/mdc/cuc/carLicenseAudit/operate/findCarLicenseAuditListByCarNo`;

+  // 导出（车辆认证表）
+  $api_carLicense_export= `/api/mdc/cuc/carLicense/operate/export`;
+


  constructor(public injector: Injector) {