|
@@ -931,17 +931,15 @@ export default {
|
|
|
this.data[index].partsPrice = sum;
|
|
|
// 销售价=(配件采购价格+产品价格)/汇率 *(1+客户FOB系数/100)
|
|
|
// this.data[index].price=_.multiply(multiplier, multiplicand)
|
|
|
-
|
|
|
- this.data[index].price = Number(
|
|
|
+ this.data[index].productPrice = Number(
|
|
|
_.multiply(
|
|
|
- _.divide(
|
|
|
- _.add(
|
|
|
- Number(sum),
|
|
|
- Number(
|
|
|
- this.data[index].partsPrice ? this.data[index].partsPrice : 0
|
|
|
- )
|
|
|
- ),
|
|
|
- Number(this.form.exchangeRate ? this.form.exchangeRate : 1)
|
|
|
+ _.add(
|
|
|
+ Number(sum),
|
|
|
+ Number(
|
|
|
+ this.data[index].purchaseAmount
|
|
|
+ ? this.data[index].purchaseAmount
|
|
|
+ : 0
|
|
|
+ )
|
|
|
),
|
|
|
_.add(
|
|
|
1,
|
|
@@ -952,11 +950,33 @@ export default {
|
|
|
)
|
|
|
)
|
|
|
).toFixed(2);
|
|
|
+ this.data[index].price = Number(
|
|
|
+ _.divide(
|
|
|
+ _.multiply(
|
|
|
+ _.add(
|
|
|
+ Number(sum),
|
|
|
+ Number(
|
|
|
+ this.data[index].purchaseAmount
|
|
|
+ ? this.data[index].purchaseAmount
|
|
|
+ : 0
|
|
|
+ )
|
|
|
+ ),
|
|
|
+ _.add(
|
|
|
+ 1,
|
|
|
+ _.divide(
|
|
|
+ Number(this.form.coefficient ? this.form.coefficient : 0),
|
|
|
+ 100
|
|
|
+ )
|
|
|
+ )
|
|
|
+ ),
|
|
|
+ Number(this.form.exchangeRate ? this.form.exchangeRate : 1)
|
|
|
+ )
|
|
|
+ ).toFixed(2);
|
|
|
const names = [];
|
|
|
const namePrices = [];
|
|
|
rows.map(e => {
|
|
|
names.push(e.goodName);
|
|
|
- namePrices.push(e.goodName + ":" + e.price);
|
|
|
+ namePrices.push(e.goodName + ":" + e.amout);
|
|
|
});
|
|
|
this.data[index].partsDescribe = names.join(",");
|
|
|
this.data[index].partsPriceDescribe = namePrices.join(";");
|