|
@@ -350,7 +350,12 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.singleRebateAmount * scope.row.ke_refundableQty }}
|
|
|
+ <!-- {{ scope.row.singleRebateAmount * scope.row.ke_refundableQty }} -->
|
|
|
+ {{
|
|
|
+ (scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
+ scope.row.ke_discAmount * scope.row.ke_refundableQty) *
|
|
|
+ scope.row.ke_rebateRate
|
|
|
+ }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -369,10 +374,17 @@
|
|
|
></el-table-column>
|
|
|
<el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
- {{
|
|
|
+ <!-- {{
|
|
|
scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
scope.row.singleRebateAmount * scope.row.ke_refundableQty -
|
|
|
scope.row.ke_discAmount
|
|
|
+ }} -->
|
|
|
+ {{
|
|
|
+ scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
+ scope.row.ke_discAmount * scope.row.ke_refundableQty -
|
|
|
+ (scope.row.ke_price * scope.row.ke_refundableQty -
|
|
|
+ scope.row.ke_discAmount * scope.row.ke_refundableQty) *
|
|
|
+ scope.row.ke_rebateRate
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -697,7 +709,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6" :lg="6">
|
|
|
- <el-form-item prop="priceType" label="价格类型">
|
|
|
+ <el-form-item prop="priceType" label="价格类型">
|
|
|
<el-select
|
|
|
v-model="orderDialog_screenForm.priceType"
|
|
|
placeholder="请选择价格类型"
|
|
@@ -1010,6 +1022,7 @@ export default {
|
|
|
if (Object.keys(item).length) {
|
|
|
this.$set(row, 'rebateWalletName', item.name)
|
|
|
this.$set(row, 'walletRebateId', item.walletRebateId)
|
|
|
+ this.$set(row, 'rebateRate', item.rebateRate)
|
|
|
}
|
|
|
} else {
|
|
|
this.$set(row, 'rebateWalletName', '')
|
|
@@ -1227,6 +1240,8 @@ export default {
|
|
|
this.$set(item, 'discAmount', 0)
|
|
|
this.$set(item, 'rebateWalletName', '')
|
|
|
this.$set(item, 'walletRebateId', '')
|
|
|
+ this.$set(item, 'rebateRate', '')
|
|
|
+
|
|
|
this.keGoodsList = [item]
|
|
|
}
|
|
|
this.closeKeGoodsDialog()
|
|
@@ -1331,6 +1346,7 @@ export default {
|
|
|
item.ke_rebateWalletName = this.keGoodsList[0].rebateWalletName
|
|
|
item.ke_walletRebateId = this.keGoodsList[0].walletRebateId
|
|
|
item.ke_discAmount = this.keGoodsList[0].discAmount
|
|
|
+ item.ke_rebateRate = this.keGoodsList[0].rebateRate
|
|
|
})
|
|
|
this.orderList = this.orderList.concat(orderList)
|
|
|
}
|