From f6ccc1285c91cf90509a6bfa78e1a15a1e29febe Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 13:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.html         |  8 ++++++--
 .../components/bulk/bulk.component.ts           | 17 +++++++++--------
 .../components/vehicle/vehicle.component.ts     | 14 +++++++-------
 .../components/freight/user/user.component.ts   |  2 +-
 .../abnormal-appear.component.ts                |  4 ++--
 5 files changed, 25 insertions(+), 20 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 4d697063..6096d1b8 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-17 17:11:26
+ * @LastEditTime: 2022-01-18 11:30:15
  * @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
@@ -63,6 +63,10 @@
     <ng-template st-row="freightPrice" let-item let-index="index">
       {{ item.freightPrice | currency}}
     </ng-template>
+    <ng-template st-row="loadingTime" let-item let-index="index">
+      <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
+      <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
+    </ng-template>
     <ng-template st-row="billCode" let-item let-index="index">
       <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
       <div>
@@ -80,7 +84,7 @@
     <ng-template st-row="mybidDetailInfo" let-item let-index="index">
       <div *ngIf="item.mybidDetailInfo.length > 0">
         <p *ngFor="let data of item.mybidDetailInfo">
-          {{ data.expenseName }}：{{ data.price }}
+          {{ data.expenseName }}：{{ data.price | currency }}
           <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
         </p>
       </div>
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 6872bd64..60da5d09 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -441,11 +441,12 @@ tabs = {
       {
         title: '运费明细',
         width: '250px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
-      { title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
       { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@@ -474,25 +475,25 @@ tabs = {
       },
       {
         title: '结算重量',
-        className: 'text-left',
+        className: 'text-right',
         index: 'settlementWeight',
-        width: '100px',
+        width: '150px',
       },
       {
         title: '承运司机',
         className: 'text-left',
         index: 'driverName',
-        width: '100px',
+        width: '150px',
       },
       {
         title: '收款人',
         className: 'text-left',
         index: 'payeeName',
-        width: '100px',
+        width: '150px',
       },
       {
         title: '装卸货时间',
-        width: '180px',
+        width: '200px',
         className: 'text-left',
         render: 'loadingTime'
       },
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 ccd123d4..bd42276d 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -401,24 +401,24 @@ resourceStatus: any;
       {
         title: '我的出价',
         width: '200px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'mybidInfo'
       },
       {
         title: '运费明细',
         width: '250px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
       { title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
-      { title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-left' },
+      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
       {
         title: '卸货地',
         className: 'text-left',
-        width: '170px',
+        width: '180px',
         index: 'unloadingAddressArr'
       },
       {
@@ -436,11 +436,11 @@ resourceStatus: any;
         title: '收款人',
         className: 'text-left',
         render: 'payeeName',
-        width: '100px',
+        width: '150px',
       },
       {
         title: '装卸货时间',
-        width: '170px',
+        width: '200px',
         className: 'text-left',
         render: 'loadingTime'
       },
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index 4618b9e2..fe17a804 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -136,7 +136,7 @@ export class FreightComponentsUserComponent implements OnInit {
             showRequired: false
           }
         },
-        contactsName: {
+        enterpriseName: {
           title: '企业名称',
           type: 'string',
           ui: {
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index ccfd49e8..4d7d70eb 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -35,8 +35,8 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
     { title: '关联运单号', index: 'wayBillCode',width: '180px' },
     { title: '网络货运人', index: 'enterpriseInfoName',width: '180px' },
     { title: '货主', index: 'shipperAppUserName' ,width: '180px'},
-    { title: '装货地', index: 'loadingPlace' ,width: '180px'},
-    { title: '卸货地', index: 'dischargePlace' ,width: '180px'},
+    { title: '装货地', index: 'loadingAddressArr' ,width: '200px'},
+    { title: '卸货地', index: 'unloadingAddressArr' ,width: '200px'},
     { title: '承运司机', index: 'driver' ,width: '90px'},
     { title: '异常信息', index: 'exceptionContent',width: '250px' },
     { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},