From 24a87e913c9c65e4cd38266349d434f4d998c3aa Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 25 Mar 2022 13:57:30 +0800
Subject: [PATCH] fix bug

---
 .../order-agreement.component.html            |  6 ++---
 .../order-agreement.component.ts              |  2 +-
 .../vehicle/components/list/list.component.ts | 27 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.html b/src/app/routes/passport/components/order-agreement/order-agreement.component.html
index 89e01a91..a9106098 100644
--- a/src/app/routes/passport/components/order-agreement/order-agreement.component.html
+++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 21:08:36
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 10:50:46
+ * @LastEditTime : 2022-03-25 13:56:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -13,7 +13,7 @@
     <h1 class="mb-md mt-md">
       {{ agreementContent?.agreementName }}
     </h1>
-    <p class="md">最新版本生效日期：{{ agreementContent?.modifyTime }}</p>
-    <div [innerHTML]="agreementContent?.agreementContent | safehtml"></div>
+    <p class="md" *ngIf="agreementContent?.modifyTime">最新版本生效日期：{{ agreementContent?.modifyTime }}</p>
+    <div [innerHTML]="agreementContent?.agreementContent || agreementContent?.contractContent | safehtml"></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts
index 96ac222d..5fa44cad 100644
--- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts
+++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-14 14:17:38
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-24 19:19:17
+ * @LastEditTime : 2022-03-25 13:52:54
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 4a06a3a8..7f81c557 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -127,6 +127,15 @@ export class VehicleComponentsListComponent implements OnInit {
             }
           }
         },
+        carLoad: {
+          title: '载重',
+          type: 'string',
+          ui: {
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         isSelf: {
           type: 'string',
           title: '是否挂靠',
@@ -174,7 +183,23 @@ export class VehicleComponentsListComponent implements OnInit {
               expand: (value: boolean) => value
             }
           }
-        }
+        },
+        isSelfs: {
+          type: 'string',
+          title: '是否入网',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '是', value: 1 },
+            { label: '否', value: 0 }
+          ],
+          ui: {
+            widget: 'select',
+            allowClear: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         // putOnRecord: {
         //   type: 'string',
         //   title: '是否已备案',