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 7be8c803..e01bc599 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
@@ -275,7 +275,7 @@
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%)
-
收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
+ 车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index 32a8b032..2e5fb6b9 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -532,7 +532,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
}
],
// 运费信息
- // 收款人
+ // 车队长
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index b69356f5..876944ea 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -156,7 +156,7 @@
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%)
- 收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
+ 车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}
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 c56db9bf..8fe0410e 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -506,7 +506,7 @@ export class OrderManagementBulkComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',
diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
index fdea46af..c6b4e3a1 100644
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
@@ -353,7 +353,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
index a5228fed..93919f4d 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@@ -364,7 +364,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 768350d9..27af1cc7 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -182,7 +182,7 @@ export class OrderManagementRiskComponent implements OnInit {
},
payeeName: {
type: 'string',
- title: '收款人',
+ title: '车队长',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
@@ -314,7 +314,7 @@ export class OrderManagementRiskComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName'
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 4bdf02bd..fc70c914 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -251,7 +251,7 @@
总计:{{ i?.totalAmount | currency }} (运费{{ i?.totalFreight | currency }},
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% )
- 收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
+ 车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 9d8e5fff..d00cc627 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -520,7 +520,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
],
// 运费信息
billExpenseDetailDTOList: this.st._data,
- // 收款人
+ // 车队长
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间
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 c05f1bcc..fc61bbff 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
@@ -163,7 +163,7 @@
总计:{{ i?.totalAmount | currency }} (运费{{ i?.totalFreight | currency }},
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% )
- 收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
+ 车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}
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 55002520..64a39077 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -765,6 +765,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
if (res) {
this.resetSF;
this.st.load();
+ this.getGoodsSourceStatistical();
}
});
}
diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
index f830ca80..2c0d7063 100644
--- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-31 14:20:41
+ * @LastEditTime : 2022-04-01 10:39:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -28,7 +28,7 @@
{{item.BACK | currency}}
- {{item.surcharge + item.traiPrice | currency}}
+ {{ item.traiPrice | currency}}
{{item.surcharge | currency}}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index b192689d..30da689b 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -190,7 +190,7 @@
(运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }})
- 收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+ 车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index f8ad9ad2..c226dd63 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -154,7 +154,7 @@
totalObj?.price - attObj?.price | currency
}},附加运费{{ attObj?.price | currency}},附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%)
- 收款人:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
+ 车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
-->
{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}({{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + ',' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}})
@@ -176,7 +176,7 @@
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%)
- 收款人:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
+ 车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index 3cf71479..e2c103eb 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -302,7 +302,7 @@ export class WaybillManagementBulkComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName',
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 c0738c77..5d3eedb2 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
@@ -157,7 +157,7 @@
总计:{{ i?.totalAmount | currency }} (运费{{ i?.totalFreight | currency }},
附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% )
- 收款人:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
+ 车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
index d3533066..6d39be94 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-23 14:49:13
+ * @LastEditTime : 2022-04-01 10:49:30
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index c3c87a70..30bce172 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -322,7 +322,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
render: 'driverName'
},
{
- title: '收款人',
+ title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName'