diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
index 0cb85e081e..99c36521d0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
index 8cb6df41e1..d00f7934d9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
@@ -22,7 +22,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
index b9d70a3028..f802cd0743 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
index 417bb5c479..c6a4b21425 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
@@ -52,7 +52,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 8268bfcdad..92ac009897 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
index a7655d64f7..56029a8292 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
@@ -70,7 +70,7 @@
-
+
@@ -238,10 +238,10 @@ export default {
// 计算方式为比例时,
if (this.formobj.calculationModeKey === '001') {
if (e.brandName === '陕汽') {
- // 预计返利 = (厂家结算价 - 运费 - 上装) * (计算标准 / 100)
+ // 预计返利 = (车辆入库价 - 运费 - 上装) * (计算标准 / 100)
e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0) - parseFloat(e.topAmount !== '' ? e.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
} else {
- // 预计返利 = (厂家结算价 - 运费) * (计算标准 / 100)
+ // 预计返利 = (车辆入库价 - 运费) * (计算标准 / 100)
e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
}
} else if (this.formobj.calculationModeKey === '002') {
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
index dcd3c20720..5fc428ddcc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
@@ -55,7 +55,7 @@
车辆信息({{ formobj.vinNo }} — {{ formobj.purchaseSystemName }} — {{ formobj.brandName }})
- 厂家结算价
+ 车辆入库价
{{ formobj.manufactorSettlementPrice }}
@@ -141,7 +141,7 @@ export default {
estimateRebateSum() {
let estimateRebate = '0'
if (this.formobj.calculationModeKey === '001') {
- // 计算方式为比例时,预计返利 = (厂家结算价 - 运费) * (计算标准 / 100)
+ // 计算方式为比例时,预计返利 = (车辆入库价 - 运费) * (计算标准 / 100)
estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
} else if (this.formobj.calculationModeKey === '002') {
// 计算方式为固定金额时,预计返利 = 计算标准
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
index cfc930329a..d0ea87a2f8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
@@ -41,7 +41,7 @@
- 厂家结算价
+ 车辆入库价
{{ formobj.manufactorSettlementPrice }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
index aa98460b35..dadeded26b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
@@ -319,7 +319,7 @@
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index e0b47fb50b..c24621151b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -180,7 +180,7 @@
- 厂家结算价(含运费):
+ 车辆入库价(含运费):
@@ -400,7 +400,7 @@ export default {
locationName: [{ required: true, message: '存放地点不能为空', trigger: 'change' }],
manufSaleAccessName: [{ required: true, message: '厂家回款通路不能为空', trigger: 'change' }],
contractPrice: [{ required: true, message: '厂家合同价(含运费)不能为空', trigger: 'blur' }],
- costPrice: [{ required: true, message: '厂家结算价(含运费)不能为空', trigger: 'blur' }],
+ costPrice: [{ required: true, message: '车辆入库价(含运费)不能为空', trigger: 'blur' }],
freight: [{ required: true, message: '运费不能为空', trigger: 'blur' }],
settlementStatusValue: [{ required: true, message: '买断状态不能为空', trigger: 'change' }],
isProblemVeh: [{ required: true, message: '是否为问题车辆不能为空', trigger: 'change' }],
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
index 8b0e267997..2c220ee05e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
@@ -155,7 +155,7 @@