|
|
@@ -522,7 +522,7 @@ export default {
|
|
|
row.cname = e.cname;
|
|
|
row.ename = e.ename;
|
|
|
row.priceCategory = e.goodsTypeName;
|
|
|
- row.purchaseCost = costCal(e.outFactoryPrice, e.taxRate);
|
|
|
+ row.purchaseCost = costCal(e.price, e.taxRate);
|
|
|
row.purchaseAmount = e.purchaseAmount;
|
|
|
row.itemProp = null;
|
|
|
row.remarksOne = null;
|
|
|
@@ -535,6 +535,35 @@ export default {
|
|
|
row.customEight = null;
|
|
|
row.customNine = null;
|
|
|
row.customTen = null;
|
|
|
+ row.partsValveName = null;
|
|
|
+ row.partsValveValue = null;
|
|
|
+ row.partsValveCostPrice = 0;
|
|
|
+ row.partsValveSalePrice = 0;
|
|
|
+ row.partsCapName = null;
|
|
|
+ row.partsCapValue = null;
|
|
|
+ row.partsCapCostPrice = 0;
|
|
|
+ row.partsCapSalePrice = 0;
|
|
|
+ row.partsHandleName = null;
|
|
|
+ row.partsHandleValue = null;
|
|
|
+ row.partsHandleCostPrice = 0;
|
|
|
+ row.partsHandleSalePrice = 0;
|
|
|
+ row.partsColourName = null;
|
|
|
+ row.partsColourValue = null;
|
|
|
+ row.partsColourCostPrice = 0;
|
|
|
+ row.partsColourSalePrice = 0;
|
|
|
+ row.partsModeName = null;
|
|
|
+ row.partsModeValue = null;
|
|
|
+ row.partsModeCostPrice = 0;
|
|
|
+ row.partsModeSalePrice = 0;
|
|
|
+ row.partsAuthenticationName = null;
|
|
|
+ row.partsAuthenticationValue = null;
|
|
|
+ row.partsAuthenticationCostPrice = 0;
|
|
|
+ row.partsAuthenticationSalePrice = 0;
|
|
|
+ row.partsOtherName = null;
|
|
|
+ row.partsOtherValue = null;
|
|
|
+ row.partsOtherCostPrice = 0;
|
|
|
+ row.partsOtherSalePrice = 0;
|
|
|
+ row.partsCost = 0;
|
|
|
row.corpId = e.corpId;
|
|
|
row.corpName = e.corpCode;
|
|
|
row.itemDescription = e.cnameDescription;
|
|
|
@@ -572,7 +601,7 @@ export default {
|
|
|
cname: e.cname,
|
|
|
ename: e.ename,
|
|
|
priceCategory: e.goodsTypeName,
|
|
|
- purchaseCost: costCal(e.outFactoryPrice, e.taxRate),
|
|
|
+ purchaseCost: costCal(e.price, e.taxRate),
|
|
|
purchaseAmount: e.purchaseAmount,
|
|
|
itemProp: null,
|
|
|
remarksOne: null,
|
|
|
@@ -585,10 +614,39 @@ export default {
|
|
|
customEight: null,
|
|
|
customNine: null,
|
|
|
customTen: null,
|
|
|
+ partsValveName: null,
|
|
|
+ partsValveValue: null,
|
|
|
+ partsValveCostPrice: 0,
|
|
|
+ partsValveSalePrice: 0,
|
|
|
+ partsCapName: null,
|
|
|
+ partsCapValue: null,
|
|
|
+ partsCapCostPrice: 0,
|
|
|
+ partsCapSalePrice: 0,
|
|
|
+ partsHandleName: null,
|
|
|
+ partsHandleValue: null,
|
|
|
+ partsHandleCostPrice: 0,
|
|
|
+ partsHandleSalePrice: 0,
|
|
|
+ partsColourName: null,
|
|
|
+ partsColourValue: null,
|
|
|
+ partsColourCostPrice: 0,
|
|
|
+ partsColourSalePrice: 0,
|
|
|
+ partsModeName: null,
|
|
|
+ partsModeValue: null,
|
|
|
+ partsModeCostPrice: 0,
|
|
|
+ partsModeSalePrice: 0,
|
|
|
+ partsAuthenticationName: null,
|
|
|
+ partsAuthenticationValue: null,
|
|
|
+ partsAuthenticationCostPrice: 0,
|
|
|
+ partsAuthenticationSalePrice: 0,
|
|
|
+ partsOtherName: null,
|
|
|
+ partsOtherValue: null,
|
|
|
+ partsOtherCostPrice: 0,
|
|
|
+ partsOtherSalePrice: 0,
|
|
|
corpId: e.corpId,
|
|
|
corpName: e.corpCode,
|
|
|
itemDescription: e.cnameDescription,
|
|
|
partsPrice: 0,
|
|
|
+ partsCost: 0,
|
|
|
itemType: e.specs,
|
|
|
tradeTerms: null,
|
|
|
productPrice: productCal(e.purchaseAmount, 0, this.form.coefficient),
|
|
|
@@ -686,30 +744,30 @@ export default {
|
|
|
this.form.totalValue = sum(multiply(e.outFactoryPrice, e.orderQuantity), this.form.totalValue)
|
|
|
})
|
|
|
calculationDomesticFees({ ...this.form, orderItemsList: this.data, }).then(res => {
|
|
|
- this.$confirm("总费用为:"+res.data.data.amount+",单项运费为" + res.data.data.amountF + ",是否继续更新?", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(() => {
|
|
|
- this.data.forEach(e => {
|
|
|
- e.shareAmount =multiply(res.data.data.amountF,e.outFactoryPrice)
|
|
|
- e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF,e.outFactoryPrice))
|
|
|
- e.amount = amountCal(
|
|
|
- addPrice(e.outFactoryPrice, res.data.data.amountF),
|
|
|
- e.orderQuantity,
|
|
|
- e.freight,
|
|
|
- e.insurance,
|
|
|
- e.discount
|
|
|
- );
|
|
|
- e.itemMargin = grossProfitCal(
|
|
|
- e.purchaseAmount,
|
|
|
- e.partsPrice,
|
|
|
- e.outFactoryPrice,
|
|
|
- this.form.exchangeRate
|
|
|
- );
|
|
|
- })
|
|
|
- });
|
|
|
- })
|
|
|
+ this.$confirm("总费用为:" + res.data.data.amount + ",单项运费为" + res.data.data.amountF + ",是否继续更新?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.data.forEach(e => {
|
|
|
+ e.shareAmount = multiply(res.data.data.amountF, e.outFactoryPrice)
|
|
|
+ e.price = addPrice(e.outFactoryPrice, multiply(res.data.data.amountF, e.outFactoryPrice))
|
|
|
+ e.amount = amountCal(
|
|
|
+ addPrice(e.outFactoryPrice, res.data.data.amountF),
|
|
|
+ e.orderQuantity,
|
|
|
+ e.freight,
|
|
|
+ e.insurance,
|
|
|
+ e.discount
|
|
|
+ );
|
|
|
+ e.itemMargin = grossProfitCal(
|
|
|
+ e.purchaseAmount,
|
|
|
+ e.partsPrice,
|
|
|
+ e.outFactoryPrice,
|
|
|
+ this.form.exchangeRate
|
|
|
+ );
|
|
|
+ })
|
|
|
+ });
|
|
|
+ })
|
|
|
},
|
|
|
khEdit(status) {
|
|
|
if (status == 'cname') {
|
Qukatie