|
@@ -733,9 +733,9 @@
|
|
|
item.id=undefined;
|
|
|
item.sourceType = 'Quo' + item.childId;
|
|
|
item.taxPrice = item.salePrice;
|
|
|
- item.discount = formData.doubleDiscount !== ''?formData.doubleDiscount:0;
|
|
|
+ item.preDiscountPrice = (item.taxPrice/(1-Number(item.discount)/100)).toFixed(2);
|
|
|
if (formData.doubleDiscount && formData.doubleDiscount !== '') {
|
|
|
- item.discountedPrice = Number(item.taxPrice) * (1 - Number(item.discount) / 100);
|
|
|
+ item.discountedPrice = Number(item.taxPrice) * (1 - Number(formData.doubleDiscount) / 100);
|
|
|
} else {
|
|
|
item.discountedPrice = Number(item.taxPrice);
|
|
|
}
|
|
@@ -780,8 +780,7 @@
|
|
|
var detail = xTable.data,
|
|
|
num = 0;
|
|
|
detail.map((item) => {
|
|
|
- item.discount = formData.doubleDiscount
|
|
|
- item.discountedPrice = (Number(item.taxPrice) * (1 - Number(item.discount) / 100)).toFixed(2);
|
|
|
+ item.discountedPrice = (Number(item.taxPrice) * (1 - Number(formData.doubleDiscount) / 100)).toFixed(2);
|
|
|
item.discountedAmount = (Number(item.discountedPrice) * Number(item.quantity)).toFixed(2);
|
|
|
num = num + Number(item.discountedAmount);
|
|
|
});
|
|
@@ -796,9 +795,9 @@
|
|
|
item.deliveryTime = formData.deliveryTime&&formData.deliveryTime!==''?formData.deliveryTime:item.deliveryTime;
|
|
|
item.sourceId = item.childId;
|
|
|
item.sourceType = 'Con' + item.childId;
|
|
|
- item.discount = formData.doubleDiscount !== ''?formData.doubleDiscount:0;
|
|
|
+ item.preDiscountPrice = (item.taxPrice/(1-Number(item.discount)/100)).toFixed(2);
|
|
|
if (formData.doubleDiscount && formData.doubleDiscount !== '') {
|
|
|
- item.discountedPrice = Number(item.taxPrice) * (1 - Number(item.discount) / 100);
|
|
|
+ item.discountedPrice = Number(item.taxPrice) * (1 - Number(formData.doubleDiscount) / 100);
|
|
|
} else {
|
|
|
item.discountedPrice = Number(item.taxPrice);
|
|
|
}
|