|
|
@@ -92,7 +92,7 @@
|
|
|
</td>
|
|
|
<td style="padding: 5px"> {{ item.measuringUnit }}</td>
|
|
|
<td style="padding: 5px"> {{ item.receiveTotalCount }}</td>
|
|
|
- <td style="padding: 5px"> {{ showPrice ? item.singlePrice : ''}} </td>
|
|
|
+ <td style="padding: 5px"> {{ showPrice ? item.discountSinglePrice : ''}} </td>
|
|
|
<td style="padding: 5px"> {{ showPrice ? item.discountTotalPrice : ''}} </td>
|
|
|
<td style="padding: 5px"> {{ item.batchNo }}</td>
|
|
|
<td style="padding: 5px"> {{ item.remark }}</td>
|
|
|
@@ -224,7 +224,7 @@ export default {
|
|
|
this.QRvisible = false;
|
|
|
},
|
|
|
calculateTotalPrice(item) {
|
|
|
- const singlePrice = parseFloat(item.singlePrice) || 0;
|
|
|
+ const singlePrice = parseFloat(item.discountSinglePrice) || 0;
|
|
|
const quantity = parseFloat(item.receiveTotalCount) || 0;
|
|
|
const total = singlePrice * quantity;
|
|
|
return formatPrice(total);
|
|
|
@@ -235,7 +235,7 @@ export default {
|
|
|
if (key === 'totalPrice') {
|
|
|
// 总价需要通过单价*数量计算,避免精度问题
|
|
|
list.forEach((item) => {
|
|
|
- const singlePrice = parseFloat(item.singlePrice) || 0;
|
|
|
+ const singlePrice = parseFloat(item.discountSinglePrice) || 0;
|
|
|
const quantity = parseFloat(item.receiveTotalCount) || 0;
|
|
|
num += singlePrice * quantity;
|
|
|
});
|
|
|
@@ -287,7 +287,7 @@ export default {
|
|
|
let totalPriceNum = 0;
|
|
|
if (this.showPrice) {
|
|
|
list.forEach((item) => {
|
|
|
- const singlePrice = parseFloat(item.singlePrice) || 0;
|
|
|
+ const singlePrice = parseFloat(item.discountSinglePrice) || 0;
|
|
|
const quantity = parseFloat(item.receiveTotalCount) || 0;
|
|
|
// totalPriceNum += singlePrice * quantity;
|
|
|
totalPriceNum += item.discountTotalPrice;
|
|
|
@@ -298,7 +298,7 @@ export default {
|
|
|
const totalPrice = this.showPrice ? totalPriceNum.toFixed(4).replace(/\.?0+$/, '') : '';
|
|
|
|
|
|
const rows = list.map((item, index) => {
|
|
|
- const singlePrice = parseFloat(item.singlePrice) || 0;
|
|
|
+ const singlePrice = parseFloat(item.discountSinglePrice) || 0;
|
|
|
const quantity = parseFloat(item.receiveTotalCount) || 0;
|
|
|
// const rowTotal = this.showPrice ? (singlePrice * quantity).toFixed(4).replace(/\.?0+$/, '') : '';
|
|
|
const rowTotal = this.showPrice ? item.discountTotalPrice : '';
|
|
|
@@ -310,7 +310,7 @@ export default {
|
|
|
<td align="center" valign="middle" style="${td}">${item.modelType || ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.measuringUnit || ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.receiveTotalCount ?? ''}</td>
|
|
|
- <td align="center" valign="middle" style="${td}">${this.showPrice ? item.singlePrice : ''}</td>
|
|
|
+ <td align="center" valign="middle" style="${td}">${this.showPrice ? item.discountSinglePrice : ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${rowTotal}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.batchNo || ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.remark || ''}</td>
|