From 5bf20e71c128fecba7359cb9bae91657231ec24d Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 15:21:30 +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

---
 .../components/bulk/bulk.component.ts         | 32 ++++++++---------
 .../components/vehicle/vehicle.component.ts   | 28 +++++++--------
 .../components/bulk/bulk.component.html       | 27 ++++++---------
 .../components/bulk/bulk.component.ts         | 33 +++++++++---------
 .../components/vehicle/vehicle.component.html |  9 +++--
 .../components/vehicle/vehicle.component.ts   | 34 +++++++++----------
 6 files changed, 81 insertions(+), 82 deletions(-)

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 b7cb5c5e..2b1ea743 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -403,71 +403,71 @@ tabs = {
       {
         title: '订单号',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'billCode'
       },
       {
         title: '运费明细',
         width: '250px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
-      { title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-center' },
-      { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-center' },
-      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
-      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
+      { title: '托运人', index: 'enterpriseProjectName', width: '120px', 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' },
       {
         title: '卸货地',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         index: 'unloadingAddressArr'
       },
       {
         title: '货物信息',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         render: 'goodsName'
       }, {
         title: '运费单价',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         index: 'freightPrice'
       },
       {
         title: '接单数量',
-        className: 'text-center',
+        className: 'text-left',
         index: 'goodsNumber',
         width: '180px',
       },
       {
         title: '结算重量',
-        className: 'text-center',
+        className: 'text-left',
         index: 'settlementWeight',
         width: '100px',
       },
       {
         title: '承运司机',
-        className: 'text-center',
+        className: 'text-left',
         index: 'driverName',
         width: '100px',
       },
       {
         title: '收款人',
-        className: 'text-center',
+        className: 'text-left',
         index: 'payeeName',
         width: '100px',
       },
       {
         title: '装卸货时间',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'loadingTime'
       },
       {
         title: '创建时间',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'createTime',
       },
       {
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 4374d5ae..874e345c 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -355,58 +355,58 @@ resourceStatus: any;
       {
         title: '订单号',
         width: '200px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'billCode'
       },
       {
         title: '我的出价',
         width: '200px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'mybidInfo'
       },
       {
         title: '运费明细',
         width: '250px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-center' },
-      { title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-center' },
-      { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-center' },
-      { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-center' },
-      { title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '170px', 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: '卸货地',
-        className: 'text-center',
+        className: 'text-left',
         width: '170px',
         index: 'unloadingAddressArr'
       },
       {
         title: '货物信息',
-        className: 'text-center',
+        className: 'text-left',
         width: '170px',
         render: 'goodsName'
       }, {
         title: '承运司机',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         render: 'driverName'
       },
       {
         title: '收款人',
-        className: 'text-center',
+        className: 'text-left',
         render: 'payeeName',
         width: '100px',
       },
       {
         title: '装卸货时间',
         width: '170px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'loadingTime'
       },
       {
         title: '创建时间',
-        className: 'text-center',
+        className: 'text-left',
         index: 'creationTime',
         width: '170px',
       },
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html
index baa5952d..9e5fd995 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-12 10:21:40
+ * @LastEditTime: 2022-01-13 15:16:07
  * @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\bulk\bulk.component.html
@@ -73,42 +73,37 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading"
     >
+    <!--运费单价  -->
+    <ng-template st-row="freightPrice" let-item let-index="index">
+      <div class="mr-xs" >{{item.freightPrice | currency}}
+      </div>
+    </ng-template>
+    <!--货源编号  -->
       <ng-template st-row="resourceCode" let-item let-index="index">
         <a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a>
       </ng-template>
+      <!-- 服务类型 -->
       <ng-template st-row="serviceType" let-item let-index="index">
         <div *ngIf="item.serviceType === 1">抢单</div>
         <div *ngIf="item.serviceType === 2">指派</div>
       </ng-template>
+      <!-- 关联订单 -->
       <ng-template st-row="orderSn" let-item let-index="index">
         <div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
           <label>{{item.wayBillStatusLabel}}</label>
           (<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
         </div>
       </ng-template>
+      <!-- 货物信息 -->
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{item?.goodsInfos?.goodsName}}</div>
         <div>货源：{{item?.goodsInfos?.goodsResource}}</div>
       </ng-template>
+      <!-- 用车需求 -->
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{item.carModelLabel}}</div>
         <div class="error">车长: {{item.carLenghtLabel}} 米</div>
       </ng-template>     
-      <ng-template st-row="demand" let-item let-index="index">
-        <div>车型: {{item.progress}}</div>
-        <div class="error">车长: {{item.progress}} 米</div>
-      </ng-template>
-      <ng-template st-row="price" let-item let-index="index">
-        <div>{{item.progress}} 元/顿</div>
-      </ng-template>
-      <ng-template st-row="cMember" let-item let-index="index">
-        <div>{{item.owner}}</div>
-        <div>{{item.mobile}}</div>
-      </ng-template>
-      <ng-template st-row="dispatcher" let-item let-index="index">
-        <div>{{item.owner}}</div>
-        <div>{{item.mobile}}</div>
-      </ng-template>
     </st>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index b9bd6bfa..8706fa15 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -194,46 +194,47 @@ export class SupplyManagementBulkComponent implements OnInit {
       {
         title: '货源编号',
         width: '200px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'resourceCode'
       },
-      { title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-center' },
-      { title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
-      { title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-center' },
-      { title: '关联订单', render: 'orderSn', width: '200px', className: 'text-center' },
-      { title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-center' },
+      { title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
+      { title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-left' },
+      { title: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' },
+      { title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-left' },
       {
         title: '装货地',
-        className: 'text-center',
+        className: 'text-left',
         index: 'loadingAddressArr', 
         width: '200px',
       }, {
         title: '卸货地',
-        className: 'text-center',
+        className: 'text-left',
         index: 'unloadingAddressArr', 
         width: '200px',
       },
       {
         title: '用车需求',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
         render: 'useCarDemand'
       },
       {
         title: '运费单价',
-        className: 'text-center',
+        className: 'text-right',
         width: '150px',
         index: 'freightPrice',
+        render: 'freightPrice'
       },
       {
         title: '结算依据',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
-        index: 'settlementBasis',
+        index: 'settlementBasisLabel',
       },
       {
         title: '货源状态',
-        className: 'text-center',
+        className: 'text-left',
         index: 'resourceStatus',
         type: 'badge',
         width: '120px',
@@ -245,18 +246,18 @@ export class SupplyManagementBulkComponent implements OnInit {
       {
         title: '截止时间',
         width: '170px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'deadlineTime',
       },
       {
         title: '发布时间',
         width: '170px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'releaseTime',
       },
       {
         title: '审核状态',
-        className: 'text-center',
+        className: 'text-left',
         index: 'auditStatus',
         type: 'badge',
         width: '170px',
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index 80c37bce..33da8925 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-22 11:28:28
- * @LastEditTime: 2022-01-05 15:45:01
+ * @LastEditTime: 2022-01-13 15:02:42
  * @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
@@ -57,8 +57,11 @@
         <p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
       </ng-template>
       <ng-template st-row="totalAmount" let-item let-index="index">
-        <!-- [nzPopoverContent]="contentTemplate" -->
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover>￥{{item.totalAmount}}
+        <div class="mr-xs" >{{item.totalAmount | currency}}
+        </div>
+      </ng-template>
+      <ng-template st-row="surcharge" let-item let-index="index">
+        <div class="mr-xs" >{{item.surcharge | currency}}
         </div>
       </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index d428b570..49b5cd04 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -358,75 +358,75 @@ export class SupplyManagementVehicleComponent implements OnInit {
       {
         title: '货源编号',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'resourceCode'
       },
       { 
       title: '货主', 
       index: 'shipperAppUserName', 
       width: '180px', 
-      className: 'text-center' },
+      className: 'text-left' },
       {
         title: '项目名称',
         index: 'enterpriseProjectName',
         width: '180px',
-        className: 'text-center'
+        className: 'text-left'
       },
       {
         title: '装货地',
         index: 'loadingAddressArr',
         width: '200px',
-        className: 'text-center'
+        className: 'text-left'
       },
       {
         title: '卸货地',
         index: 'unloadingAddressArr',
         width: '200px',
-        className: 'text-center'
+        className: 'text-left'
       },
       {
         title: '货物名称',
         index: 'goodsName',
         width: '150px',
-        className: 'text-center'
+        className: 'text-left'
       },
       {
         title: '货物数量',
         width: '200px',
         index: 'goodsNumber',
-        className: 'text-center',
+        className: 'text-left',
         format: item => item.goodsNumber.join('/')
       },
       {
         title: '用车需求',
-        className: 'text-center',
-        width: '120px',
+        className: 'text-left',
+        width: '180px',
         render: 'useCarDemand'
       },
       {
         title: '总费用',
-        className: 'text-center',
+        className: 'text-right',
         width: '120px',
         index: 'totalAmount',
         render: 'totalAmount'
       },
       {
         title: '总运费',
-        width: '120px',
-        className: 'text-center',
+        width: '150px',
+        className: 'text-right',
         index: 'totalAmount',
         render: 'totalAmount'
       },
       {
         title: '附加费',
-        className: 'text-center',
+        className: 'text-right',
         width: '120px',
         index: 'surcharge',
-        format: item => `￥${item.surcharge}`
+        render: 'surcharge'
       },
       {
         title: '货源状态',
-        className: 'text-center',
+        className: 'text-left',
         index: 'resourceStatus',
         type: 'badge',
         width: '120px',
@@ -439,12 +439,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
         title: '创建时间',
         width: '170px',
         index: 'createTime',
-        className: 'text-center',
+        className: 'text-left',
         type: 'date'
       },
       {
         title: '审核状态',
-        className: 'text-center',
+        className: 'text-left',
         index: 'auditStatus',
         type: 'badge',
         width: '170px',