diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
index 2f8ec35b..7086580d 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
@@ -32,38 +32,5 @@
padding-right: 100px;
}
- .handling-info {
- min-height: 90px;
- border: 1px solid #ccc;
- .loading-row {
- display: flex;
- }
-
- .handling-info-icon {
- width: 32px;
- height: 32px;
- margin-right: 24px;
- color: #fff;
- line-height: 32px;
- text-align: center;
- border-radius: 50%;
-
- &.loading-bg {
- background-color: #50D4AB;
- }
-
- &.unloaing-bg {
- background: #F66F6A;
- }
- }
-
- .info {
- flex: 1;
- }
-
- .time-info {
- margin-left: 56px;
- }
- }
}
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index 77d86ed1..62179383 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -194,7 +194,8 @@
运费信息
-
+
{{ item.price | currency }}
@@ -228,7 +229,7 @@
补充协议
-
+
{
if (this.sf) {
Object.assign(requestOptions.body, {
- ...this.sf?.value,
+ ...this.sf?.value
});
}
return requestOptions;
@@ -77,34 +77,41 @@ export class BillingOrderComponent implements OnInit {
serviceType: {
title: '服务类型',
type: 'string',
- enum: [{
- label: '全部',
- value: ''
- },{
- label: '整车抢单',
- value: 1
- },{
- label: '整车指派',
- value: 2
- },{
- label: '大宗抢单',
- value: 3
- },{
- label: '大宗指派',
- value: 4
- },{
- label: '结算单',
- value: 5
- }],
+ enum: [
+ {
+ label: '全部',
+ value: ''
+ },
+ {
+ label: '整车抢单',
+ value: 1
+ },
+ {
+ label: '整车指派',
+ value: 2
+ },
+ {
+ label: '大宗抢单',
+ value: 3
+ },
+ {
+ label: '大宗指派',
+ value: 4
+ },
+ {
+ label: '结算单',
+ value: 5
+ }
+ ],
ui: {
- widget: 'select',
+ widget: 'select'
}
},
shipperAppUserName: {
type: 'string',
title: '货主名称',
ui: {
- placeholder: '请输入',
+ placeholder: '请输入'
}
},
vatappcode: {
@@ -245,7 +252,7 @@ export class BillingOrderComponent implements OnInit {
format: record => `${record.paymentMethodRate}%`
},
{ title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
- { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
+ { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },
{
title: '服务类型',
render: 'serviceType',
@@ -260,30 +267,34 @@ export class BillingOrderComponent implements OnInit {
title: '承运司机',
index: 'driverName',
className: 'text-center',
- width: '120px',
+ width: '120px'
},
{
title: '车队长',
className: 'text-center',
width: '120px',
- index: 'carCaptainName',
+ index: 'carCaptainName'
},
- { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', },
+ { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center' },
// { title: '录单时间', index: 'recordTime', type: 'date', className: 'text-center', width: '150px' }, //TODO
- { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center', },
- { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', },
- { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', },
- { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', },
+ { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center' },
+ { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center' },
+ { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center' },
+ { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center' },
{ title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 },
{ title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 },
{ title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 },
- { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', },
- { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', },
+ { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center' },
+ { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center' },
{ title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' },
{ title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' },
// { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO
{
- title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget',
+ title: 'ETC开票金额',
+ index: 'etcInvoiceMoney',
+ className: 'text-center',
+ width: 120,
+ type: 'widget',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) }
}
];
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index f21d4a47..eaaba227 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -179,8 +179,9 @@
运费信息
（到货后{{i?.paymentDays}}天内支付运费）
-
-
+
+
{{ item.price | currency }}
diff --git a/src/styles/common/global.less b/src/styles/common/global.less
index ebf343e7..c499a3a5 100644
--- a/src/styles/common/global.less
+++ b/src/styles/common/global.less
@@ -65,7 +65,7 @@
.handling-info {
min-height: 100%;
- border: 1px solid #ccc;
+ border: 1px solid #EAECEF;
.loading-row {
display: flex;