修复入库耗材计算错误
This commit is contained in:
@@ -14,9 +14,11 @@
|
||||
<el-form-item label="耗材价格" prop="price">
|
||||
<div class="center">
|
||||
<el-input-number v-model="form.price" placeholder="请输入" @change="onPriceChange"></el-input-number>
|
||||
<span>{{ form.conUnit }}</span>
|
||||
<div class="ipt">
|
||||
第二单位价格:
|
||||
<el-input-number v-model="twoPrice" placeholder="请输入" @change="onTwoPriceChange"></el-input-number>
|
||||
<span>{{ form.conUnitTwo }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
@@ -280,9 +280,9 @@ export default {
|
||||
return price;
|
||||
}
|
||||
if (row.conUnitTwo && row.unit == row.conUnitTwo) {
|
||||
console.log(price / row.conUnitTwoConvert);
|
||||
console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert)));
|
||||
return new Decimal(price).div(new Decimal(row.conUnitTwoConvert));
|
||||
// console.log(price / row.conUnitTwoConvert);
|
||||
// console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert)));
|
||||
return new Decimal(price).mul(new Decimal(row.conUnitTwoConvert));
|
||||
}
|
||||
return price;
|
||||
},
|
||||
@@ -294,7 +294,7 @@ export default {
|
||||
return number;
|
||||
}
|
||||
if (row.conUnitTwo && row.unit == row.conUnitTwo) {
|
||||
return number * row.conUnitTwoConvert;
|
||||
return number / row.conUnitTwoConvert;
|
||||
}
|
||||
return number;
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user