diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 7073674d..132bce32 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -1,7 +1,7 @@
+
+ {{item.freightPrice | currency}}
+
+
+
{{item?.resourceCode}}
+
抢单
指派
+
(0?'#1890FF':''}">{{item?.count}})
+
{{item?.goodsInfos?.goodsName}}
货源:{{item?.goodsInfos?.goodsResource}}
+
车型: {{item.carModelLabel}}
车长: {{item.carLenghtLabel}} 米
-
- 车型: {{item.progress}}
- 车长: {{item.progress}} 米
-
-
- {{item.progress}} 元/顿
-
-
- {{item.owner}}
- {{item.mobile}}
-
-
- {{item.owner}}
- {{item.mobile}}
-
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 @@
-
¥{{item.totalAmount}}
+
{{item.totalAmount | currency}}
+
+
+
+ {{item.surcharge | currency}}
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',
diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html
index a620a4f6..dd00617b 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@@ -1,7 +1,7 @@