From 2c593c17a96fbd640ee2844dd509c63aaf45c987 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Feb 2022 19:59:51 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail/bulk-detail.component.html           | 12 ++++++------
 .../vehicle-detail/vehicle-detail.component.html     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index a5491976..2b7cd298 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-21 19:17:56
+ * @LastEditTime : 2022-02-21 19:58:30
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@@ -177,19 +177,19 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{i?.receiptType == 1 ?'是':'否'}}
     </sv>
     <sv label="回单类型">
-      {{i?.goodsResource?.receiptTypeLabel}}
+      {{i?.receiptTypeLabel}}
     </sv>
     <sv label="联系人">
-      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
+      {{i?.receiptUser}} / {{i?.receiptUserPhone}}
     </sv>
     <sv label="所在地区">
-      {{i?.goodsResource?.receiptAddress}}
+      {{i?.receiptPlace}}
     </sv>
     <sv label="详细地址">
-      {{i?.goodsResource?.receiptAddress}}
+      {{i?.receiptAddress}}
     </sv>
   
   </sv-container>
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index 8db6ff94..fa0543a7 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-21 19:52:12
+ * @LastEditTime : 2022-02-21 19:59:25
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@@ -164,19 +164,19 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{i?.receiptType == 1 ?'是':'否'}}
     </sv>
     <sv label="回单类型">
-      {{i?.goodsResource?.receiptTypeLabel}}
+      {{i?.receiptTypeLabel}}
     </sv>
     <sv label="联系人">
-      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
+      {{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}}
     </sv>
     <sv label="所在地区">
-      {{i?.goodsResource?.receiptAddress}}
+      {{i?.receiptPlace}}
     </sv>
     <sv label="详细地址">
-      {{i?.goodsResource?.receiptAddress}}
+      {{i?.receiptAddress}}
     </sv>
   
   </sv-container>