|
|
@ -158,7 +158,7 @@ |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="数量" align="center" width="100"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-model="scope.row.count" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" clearable placeholder="" /> |
|
|
|
<el-input @input="computeYHAndXSJE(scope.row)" v-model="scope.row.count" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" clearable placeholder="" /> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="折扣" align="center" width="100"> |
|
|
@ -637,12 +637,12 @@ export default { |
|
|
|
// 计算优惠、销售金额 |
|
|
|
computeYHAndXSJE(row) { |
|
|
|
// 计算优惠(销售价 * (1 - (折扣 * 0.1))) |
|
|
|
row.discountAmount = Math.round((parseFloat(row.price === '' ? '0' : row.price) * Math.round((parseFloat(1) - parseFloat(row.discount === '' ? '0' : row.discount) * parseFloat(0.1)) * 100) / 100) * 100) / 100 |
|
|
|
row.discountAmount = Math.round(((parseFloat(row.price === '' ? '0' : row.price) * parseFloat(row.count === '' ? '0' : row.count)) * Math.round((parseFloat(1) - parseFloat(row.discount === '' ? '0' : row.discount) * parseFloat(0.1)) * 100) / 100) * 100) / 100 |
|
|
|
// 计算销售金额(销售价 - 优惠) |
|
|
|
if (row.price == 0) { |
|
|
|
row.amount = '0' |
|
|
|
} else { |
|
|
|
row.amount = Math.round((parseFloat(row.price === '' ? '0' : row.price) - parseFloat(row.discountAmount === '' ? '0' : row.discountAmount)) * 100) / 100 |
|
|
|
row.amount = Math.round(((parseFloat(row.price === '' ? '0' : row.price) * parseFloat(row.count === '' ? '0' : row.count)) - parseFloat(row.discountAmount === '' ? '0' : row.discountAmount)) * 100) / 100 |
|
|
|
} |
|
|
|
}, |
|
|
|
subjoinAdd() { |
|
|
@ -795,6 +795,8 @@ export default { |
|
|
|
settleTime: '' |
|
|
|
} |
|
|
|
} |
|
|
|
this.commodityData = [] |
|
|
|
this.subjoinData = [] |
|
|
|
this.settleVisible = false |
|
|
|
this.submitdisabled = false |
|
|
|
this.$emit('doback') |
|
|
|