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 49042a0e..a32bc940 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 14:57:31 + * @LastEditTime : 2022-03-23 10:28:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -99,11 +99,10 @@ -
{{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }}
-
- -
{{ item?.payeeName }}/{{ item?.payeePhone }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }}

+
{{ item?.payeeName ? item?.payeeName + '/' : ''}}{{ item?.payeePhone }}
+
装 | {{ item?.loadingTime }}
卸 | {{ item?.unloadingTime }}
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 75d29b9a..a21f17b7 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -380,17 +380,8 @@ export class OrderManagementVehicleComponent implements OnInit { className: 'text-left', render: 'billCode' }, - { - title: '运费明细', - width: '250px', - className: 'text-right', - render: 'mybidDetailInfo' - }, - { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, - { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' }, - { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' }, - { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' }, { title: '卸货地', @@ -398,6 +389,12 @@ export class OrderManagementVehicleComponent implements OnInit { width: '180px', index: 'unloadingAddressArr' }, + { + title: '运费明细', + width: '250px', + className: 'text-right', + render: 'mybidDetailInfo' + }, { title: '货物信息', className: 'text-left', @@ -410,12 +407,9 @@ export class OrderManagementVehicleComponent implements OnInit { width: '250px', render: 'driverName' }, - { - title: '收款人', - className: 'text-left', - render: 'payeeName', - width: '180px' - }, + { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, + { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' }, + { title: '关联货源编号', index: 'resourceCode', width: '170px', className: 'text-left' }, { title: '装卸货时间', width: '200px', diff --git a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.less b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.less index 6dd216c6..a9401899 100644 --- a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.less +++ b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.less @@ -29,13 +29,13 @@ } .drivercard{ position: absolute; - top: 710px; + top: 50%; left: 330px; border: solid 1px #ebf0fb; } .jopcard{ position: absolute; - top: 1115px; + top: 79%; left: 330px; border: solid 1px #ebf0fb; }