From aee194c49af8e6ef9d8f65cbfd279052e58599e8 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 28 Feb 2022 14:00:19 +0800
Subject: [PATCH] fix bug

---
 .../order-management/components/bulk/bulk.component.html     | 4 ++--
 .../components/vehicle/vehicle.component.html                | 4 ++--
 .../usercenter/components/driver/driver.component.html       | 3 +++
 .../routes/usercenter/components/driver/driver.component.ts  | 5 ++++-
 src/app/routes/vehicle/components/list/list.component.ts     | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index 138444ec..74101efc 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 17:47:08
+ * @LastEditTime : 2022-02-28 13:59:36
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -95,7 +95,7 @@
         <div>
           <span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
           <span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
-          <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
+          <span>{{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}</span>
         </div>
       </ng-template>
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index 32f66f46..47c1979c 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 17:47:23
+ * @LastEditTime : 2022-02-28 13:59:54
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -80,7 +80,7 @@
         <div>
           <span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
           <span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
-          <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
+          <span>{{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}</span>
         </div>
       </ng-template>
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
diff --git a/src/app/routes/usercenter/components/driver/driver.component.html b/src/app/routes/usercenter/components/driver/driver.component.html
index 4be50dc6..bb72ce20 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.html
+++ b/src/app/routes/usercenter/components/driver/driver.component.html
@@ -44,6 +44,9 @@
     <ng-template st-row="promotersTelephone" let-item let-index="index">
       <a (click)="addPromoter(item)"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
     </ng-template>
+    <ng-template st-row="carNo" let-item let-index="index">
+      <a (click)="addPromoter(item)" >{{ item.carNo  }}</a>
+    </ng-template>
   </st>
 </nz-card>
 
diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts
index cf5c6376..b1c031e1 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver.component.ts
@@ -258,7 +258,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       { title: '司机姓名', className: 'text-center', index: 'name' , width: 150},
       { title: '手机号', className: 'text-center', index: 'mobile',width: 150  },
       { title: '身份证号码', className: 'text-center', index: 'identityNo', width: 200 },
-      { title: '当前车辆', className: 'text-center', index: 'carNo' , width: 200},
+      { title: '当前车辆', className: 'text-center', render: 'carNo' , width: 200},
       { title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName' , width: 200},
       { title: '审核时间', className: 'text-center', index: 'approvalTime' , width: 200},
       {
@@ -333,4 +333,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       }
     ];
   }
+  viewCar(item: any) {
+    this.router.navigate(['/vehicle/list/detail/' + item.id], { queryParams: { carId: item.carId } });
+  }
 }
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 28757f35..fab25972 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -253,7 +253,7 @@ export class VehicleComponentsListComponent implements OnInit {
             text: '查看',
             acl: { ability: ['VEHICLE-LIST-view'] },
             click: item => {
-              this.router.navigate(['/vehicle/list/detail/' + item.id], { queryParams: { carId: item.carId } });
+              this.router.navigate(['/vehicle/list/detail/' + item.id] );
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
             }
           }