From 1037567ab0e74fdc3c24f66accd3fd68325cf525 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 22 Feb 2022 19:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.html       | 22 ++++---------------
 .../components/vehicle/vehicle.component.html |  5 ++++-
 2 files changed, 8 insertions(+), 19 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 a1f430c5..138444ec 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-10 13:35:33
+ * @LastEditTime : 2022-02-22 17:47:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -83,6 +83,9 @@
       </ng-template>
       <ng-template st-row="billCode" let-item let-index="index">
         <a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a>
+        <div>
+          <span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel }}</span>
+        </div>
         <div>
           <span>{{ item?.billStatusLabel }}</span>
         </div>
@@ -103,23 +106,6 @@
           </p>
         </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 #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>
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 1db00140..cbc692af 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 15:23:06
+ * @LastEditTime : 2022-02-22 17:47:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -68,6 +68,9 @@
     >
       <ng-template st-row="billCode" let-item let-index="index">
         <a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <div>
+          <span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel }}</span>
+        </div>
         <div>
           <span>{{ item?.billStatusLabel }}</span>
         </div>