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 f5bbe5f8f9..89306131db 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
@@ -16,53 +16,44 @@
单车返利
-
+
-
- *返利类型
-
-
+
+ *采购方式
-
+
-
- *厂家返利名称
-
-
-
-
-
- *所属年月
+
+ *厂家返利名称
+
-
-
+
+ *所属年月
+
-
- *计算方式
-
-
+
+ *计算方式
-
+
-
- *计算标准
+
+
+ *计算标准
(%)
(元)
-
-
-
-
+
+
-
+
返利车辆列表
批量选择
@@ -76,13 +67,29 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -207,22 +214,32 @@ export default {
value.forEach((e) => {
this.formobj.scmVehRebateVehs.push({
vinNo: e.vinNo,
+ vehSid: e.vehSid,
manufactorSettlementPrice: e.manufactorSettlementPrice,
freight: e.freight,
+ topAmount: e.topAmount,
+ estimateRebate: '',
+ expectTreatCost: '',
+ expectSuppCost: '',
+ expectSuppRemark: '',
brandName: e.brandName,
brandSid: e.brandSid,
vehModelName: e.vehModelName,
vehModelSid: e.vehModelSid,
- vehSid: e.vehSid,
- estimateRebate: '',
remarks: ''
})
})
}
this.formobj.scmVehRebateVehs.forEach((e) => {
- // 计算方式为比例时，预计返利 = （厂家结算价 - 运费） * （计算标准 / 100）
+ // 计算方式为比例时，
if (this.formobj.calculationModeKey === '001') {
- e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+ if (e.brandName === '陕汽') {
+ // 预计返利 = （厂家结算价 - 运费 - 上装） * （计算标准 / 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）
+ 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') {
// 计算方式为固定金额时，预计返利 = 计算标准
e.estimateRebate = this.formobj.calculationStandard
@@ -306,7 +323,20 @@ export default {
}
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 9bad4b7fc8..1ef44f130c 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
@@ -14,89 +14,164 @@
单车返利
-
-
-
- 返利类型
+
+
+
+ 品牌
+ {{ formobj.brandName }}
-
- {{ formobj.rebateTypeValue }}
+
+ 车型
+ {{ formobj.vehModelName }}
-
- 厂家返利名称
+
+ 车架号
+ {{ formobj.vinNo }}
-
- {{ formobj.rebateName }}
+
+
+
+ 厂家结算价
+ {{ formobj.manufactorSettlementPrice }}
-
- 所属年月
+
+ 运费
+ {{ formobj.freight }}
-
- {{ formobj.palceGenDate }}
+
+ 上装
+ {{ formobj.topAmount }}
-
- 计算方式
+
+ 返利类型
+ {{ formobj.rebateTypeValue }}
+
+
+ 返利名称
+ {{ formobj.rebateName }}
-
- {{ formobj.calculationModeValue }}
+
+ 所属年月
+ {{ formobj.palceGenDate }}
-
- 计算标准
- (%)
- (元)
-
+
+
+
+ 计算方式
+ {{ formobj.calculationModeValue }}
-
- {{ formobj.calculationStandard }}
+
+ 计算标准
+ {{ formobj.calculationStandard }}
+
+
+ 状态
+ {{ formobj.state == '0' ? '未计提' : formobj.state == '1' ? '计提中' : formobj.state == '2' ? '待核对' : formobj.state == '3' ? '核对中' : formobj.state == '4' ? '已核对' : '' }}
-
-
- 车架号
+
+ 预提返利
+ {{ formobj.estimateRebate }}
-
-
- {{ formobj.vinNo }}
-
+
+ 其中待支付费用
+ {{ formobj.expectTreatCost }}
-
- 厂家结算价
+
+ 其中抵顶费用
+ {{ formobj.expectSuppCost }}
-
-
- {{ formobj.manufactorSettlementPrice }}
-
+
+
+
+ 抵顶费用说明
+ {{ formobj.expectSuppRemark }}
-
- 其中运费
+
+
+
+ 备注
+ {{ formobj.remarks }}
+
+
+ 一次上传
+
+
+ 上传日期
+ {{ formobj.uploadDate }}
-
-
- {{ formobj.freight }}
-
+
+ 上传金额
+ {{ formobj.uploadMoney }}
+
+
+ 其中待确定金额
+ {{ formobj.stayDetermineMoney }}
-
- 预计返利
+
+ 其中待支付费用
+ {{ formobj.onceTreatCost }}
+
+
+ 其中抵顶费用
+ {{ formobj.onceSuppCost }}
-
-
- {{ formobj.estimateRebate }}
-
+
+ 抵顶费用说明
+ {{ formobj.onceSuppRemark }}
-
- 备注
+
+ 二次上传
+
+
+ 上传日期
+ {{ formobj.secondaryUploadDate }}
-
-
- {{ formobj.remarks }}
-
+
+ 上传金额
+ {{ formobj.secondaryUploadMoney }}
+
+
+
+
+
+
+ 其中待支付费用
+ {{ formobj.secondTreatCost }}
+
+
+ 其中抵顶费用
+ {{ formobj.secondSuppCost }}
+
+
+ 抵顶费用说明
+ {{ formobj.secondSuppRemark }}
+
+
+ 调整说明
+
+
+ 差异金额
+ {{ formobj.diffAmount }}
+
+
+ 是否调整
+ {{ formobj.isAdjustment }}
+
+
+ 调整金额
+ {{ formobj.adjustmentMoney }}
+
+
+
+
+ 调整说明
+ {{ formobj.adjustmentRemarks }}
@@ -146,5 +221,11 @@ export default {
}