From 3a0b624f039667252de8bb2892f56742596e6367 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 12 Jan 2022 17:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-detail/bulk-detail.component.html       | 14 ++++++--------
 .../vehicle-detail/vehicle-detail.component.html | 12 ++++++------
 .../components/vehicle/vehicle.component.html    | 16 ++++++++--------
 .../components/vehicle/vehicle.component.ts      |  5 +++++
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 65315a80..cac1ed5a 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-05 16:36:39
+ * @LastEditTime: 2022-01-12 17:46:09
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -174,19 +174,17 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
     </sv>
     <sv label="回单类型">
-      {{i?.goodsResource?.receiptTypeLabel}}
-    </sv>
-    <sv label="联系人">
-      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
+    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
     <sv label="所在地区">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.supplementaryInformationVO?.area }}
     </sv>
     <sv label="详细地址">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.supplementaryInformationVO?.address }}
     </sv>
   
   </sv-container>
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index ccc5da03..08e5f5c3 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-12 17:33:24
+ * @LastEditTime: 2022-01-12 17:45:57
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -165,17 +165,17 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
     </sv>
     <sv label="回单类型">
-      {{ i?.goodsResource?.receiptType === '1' ? '电子回单' : '纸质回单' }}
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人"> {{ i?.goodsResource?.receiptUserName }} / {{ i?.goodsResource?.phon }} </sv>
+    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
     <sv label="所在地区">
-      {{ i?.goodsResource?.area }}
+      {{ i?.supplementaryInformationVO?.area }}
     </sv>
     <sv label="详细地址">
-      {{ i?.goodsResource?.address }}
+      {{ i?.supplementaryInformationVO?.address }}
     </sv>
 
   </sv-container>
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 c660c9f0..cb6b5966 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-12 13:30:48
+ * @LastEditTime: 2022-01-12 17:47:17
  * @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\supply-management\components\vehicle\vehicle.component.html
@@ -73,14 +73,14 @@
         <span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
       </div>
     </ng-template>
-       <!-- 运费明细 -->
-       <!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-        <div *ngFor="let i of item?.mybidDetailInfo">
-          <div></div>
-        </div>
-      </ng-template> -->
+     <!-- 我的出价 -->
+     <ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
+      <div *ngIf="item.mybidInfo?.length > 0">
+        <p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}：￥{{ data?.price | number:'0.2-2' }} </p>
+      </div>
+    </ng-template>
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-        <div *ngIf="item.mybidDetailInfo.length > 0">
+        <div *ngIf="item.mybidDetailInfo?.length > 0">
           <p *ngFor="let data of item.mybidDetailInfo">
             {{ data.expenseName }}：{{ data.price }}
             <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 5733a5b3..03e00403 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -342,6 +342,11 @@ resourceStatus: any;
         className: 'text-center',
         render: 'billCode'
       },
+      {
+        title: '我的出价',
+        width: '150px',
+        render: 'mybidInfo'
+      },
       {
         title: '运费明细',
         width: '200px',