|
@@ -2558,7 +2558,6 @@ export default {
|
|
|
|
|
|
// }
|
|
|
// }
|
|
|
- console.log('2', this.goodsoptions)
|
|
|
// 处理金额
|
|
|
this.data[i].amount = amountCal(
|
|
|
this.data[i].price,
|
|
@@ -2570,23 +2569,23 @@ export default {
|
|
|
this.detailData.status = 1
|
|
|
}
|
|
|
|
|
|
- amountSum = _.add(
|
|
|
- amountSum,
|
|
|
- _.multiply(
|
|
|
- numCal(this.data[i].amount),
|
|
|
- numCal(this.data[i].exchangeRate)
|
|
|
- )
|
|
|
- );
|
|
|
- costSum = _.add(
|
|
|
- costSum,
|
|
|
- _.multiply(
|
|
|
- _.add(
|
|
|
- numCal(this.data[i].purchaseAmount),
|
|
|
- numCal(this.data[i].partsPrice)
|
|
|
- ),
|
|
|
- numCal(this.data[i].orderQuantity)
|
|
|
- )
|
|
|
- );
|
|
|
+ // amountSum = _.add(
|
|
|
+ // amountSum,
|
|
|
+ // _.multiply(
|
|
|
+ // numCal(this.data[i].amount),
|
|
|
+ // numCal(this.data[i].exchangeRate)
|
|
|
+ // )
|
|
|
+ // );
|
|
|
+ // costSum = _.add(
|
|
|
+ // costSum,
|
|
|
+ // _.multiply(
|
|
|
+ // _.add(
|
|
|
+ // numCal(this.data[i].purchaseAmount),
|
|
|
+ // numCal(this.data[i].partsPrice)
|
|
|
+ // ),
|
|
|
+ // numCal(this.data[i].orderQuantity)
|
|
|
+ // )
|
|
|
+ // );
|
|
|
}
|
|
|
}
|
|
|
const orderFeesList = this.$refs.feeInfo.submitData();
|
|
@@ -2606,31 +2605,31 @@ export default {
|
|
|
if (!orderFeesList[i].exchangeRate) {
|
|
|
return this.$message.error(`请正确输入第${i + 1}行的汇率`);
|
|
|
}
|
|
|
- if (orderFeesList[i].feesType == 1) {
|
|
|
- reSum = _.add(
|
|
|
- reSum,
|
|
|
- _.multiply(
|
|
|
- numCal(orderFeesList[i].amount),
|
|
|
- numCal(orderFeesList[i].exchangeRate)
|
|
|
- )
|
|
|
- );
|
|
|
- }
|
|
|
- if (orderFeesList[i].feesType == 2) {
|
|
|
- paySum = _.add(
|
|
|
- paySum,
|
|
|
- _.multiply(
|
|
|
- numCal(orderFeesList[i].amount),
|
|
|
- numCal(orderFeesList[i].exchangeRate)
|
|
|
- )
|
|
|
- );
|
|
|
- }
|
|
|
+ // if (orderFeesList[i].feesType == 1) {
|
|
|
+ // reSum = _.add(
|
|
|
+ // reSum,
|
|
|
+ // _.multiply(
|
|
|
+ // numCal(orderFeesList[i].amount),
|
|
|
+ // numCal(orderFeesList[i].exchangeRate)
|
|
|
+ // )
|
|
|
+ // );
|
|
|
+ // }
|
|
|
+ // if (orderFeesList[i].feesType == 2) {
|
|
|
+ // paySum = _.add(
|
|
|
+ // paySum,
|
|
|
+ // _.multiply(
|
|
|
+ // numCal(orderFeesList[i].amount),
|
|
|
+ // numCal(orderFeesList[i].exchangeRate)
|
|
|
+ // )
|
|
|
+ // );
|
|
|
+ // }
|
|
|
}
|
|
|
- this.form.singleTicketMargin = STGPCal(
|
|
|
- amountSum,
|
|
|
- reSum,
|
|
|
- costSum,
|
|
|
- paySum
|
|
|
- );
|
|
|
+ // this.form.singleTicketMargin = STGPCal(
|
|
|
+ // amountSum,
|
|
|
+ // reSum,
|
|
|
+ // costSum,
|
|
|
+ // paySum
|
|
|
+ // );
|
|
|
this.form.totalValue = 0
|
|
|
this.data.forEach(async (e, index) => {
|
|
|
e.sort = Number(index) + 1
|