From 244c708a5fa217749ac644fa8fc0e2040972b51f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 19:38:41 +0800
Subject: [PATCH 1/3] =?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

---
 .../components/vehicle-detail/vehicle-detail.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index f68f0cf0..9388ef6f 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -146,7 +146,7 @@
           </span>
           <span>（运费{{i?.totalFreight | currency: '￥'}}含附加运费 {{i?.totalSurcharge| currency: '￥' }}）</span>
         </h3>
-        <div>收款人：曹济发 / 18211579566 / 621483****6368</div>
+        <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
       </div>
     </div>
     <!-- <div>

From 63d76dd8cccbd57f0f9d8e09c8efaa750609f0fe Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 19:55:10 +0800
Subject: [PATCH 2/3] =?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

---
 .../components/bulk-detail/bulk-detail.component.html    | 9 +++++----
 .../components/audit/detail/detail.component.html        | 2 +-
 2 files changed, 6 insertions(+), 5 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 757c8462..b851b053 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-13 10:07:03
+ * @LastEditTime: 2022-01-13 19:44:00
  * @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
@@ -143,9 +143,10 @@
 
   </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
-      totalObj?.price - attObj?.price
-    }}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
+    <div>
+      总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price  | currency }}</span> （运费￥{{
+        totalObj?.price - attObj?.price  | currency}}，附加费￥{{ attObj?.price  | currency }}，附加费率{{i?.attPercent }}%）
+    </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html
index c9d4ea19..ed990bf8 100644
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html
@@ -28,7 +28,7 @@
         </div>
       </sv-title>
       <sv label="申请时间">
-        {{ detailData?.approvalPassTime }}
+        {{ detailData?.createTime }}
       </sv>
       <sv label="录入人员">
         {{ detailData?.saveUser }}

From 87453dfe1253b4f6078bfafda12a9a434e2d7f37 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 20:10:14 +0800
Subject: [PATCH 3/3] =?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

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

diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index 3f589659..55d8005d 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -11,7 +11,7 @@
         <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
       </div>
       <div nz-row>
-        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div>
+        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.shipperAppUserName}}</div>
         <div nz-col nzSpan="10">
           <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'">取消货源</button>
           <button nz-button (click)="assignedCar(i)"
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index 9388ef6f..f1d7e441 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -28,7 +28,7 @@
       <nz-divider></nz-divider>
       <div sv-container *ngIf="i">
         <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
-        <sv label="项目">{{i?.enterpriseProjectId}}</sv>
+        <sv label="项目">{{i?.enterpriseProjectName}}</sv>
         <sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
         <sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
         <sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
@@ -162,7 +162,7 @@
         {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
       </sv>
       <sv label="回单类型">
-        {{i?.supplementaryInformationVO?.receiptTypeLabel}}
+        {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
       </sv>
       <sv label="所在地区">
         {{i?.supplementaryInformationVO?.area}}