|
@@ -480,11 +480,10 @@
|
|
|
item.taxRate = obj.rateNumber
|
|
|
item.grossMargin = obj.grossMargin
|
|
|
item.discount= formData.custumerDiscount!==''?formData.custumerDiscount:''
|
|
|
+ // item.purchasePrice = 1000
|
|
|
}
|
|
|
var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
|
|
|
- saleQuotationFormProductTable.dataSource=arrProduct
|
|
|
- formData.currency = '美元'
|
|
|
- formData.exchangeRate = '1'
|
|
|
+ saleQuotationFormProductTable.dataSource=arrProduct
|
|
|
}
|
|
|
//选择项目
|
|
|
function addProject(data) {
|
|
@@ -643,6 +642,9 @@
|
|
|
item.supplierName = item.selectionSupplier_dictText
|
|
|
item.purchasePrice = item.taxPriceUsd
|
|
|
item.taxAmount = 0
|
|
|
+ item.currencyGys = item.currency
|
|
|
+ item.exchangeRateGys = item.exchangeRateUsd
|
|
|
+ item.taxPriceGys = item.taxPrice
|
|
|
}
|
|
|
var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
|
|
|
arrProduct.map(item=>{
|
|
@@ -708,9 +710,12 @@
|
|
|
}
|
|
|
function changeValues(prop){
|
|
|
if(prop.col.key=='purchasePrice'||prop.col.key=='taxRate'||prop.col.key=='tariff'||prop.col.key=='discount'||prop.col.key=='grossMargin'||prop.col.key=='customerCommision'||prop.col.key=='intermediatorCommission'){
|
|
|
- //汇率默认为1
|
|
|
+ //汇率默认为1
|
|
|
formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null)?1:formData.exchangeRate
|
|
|
+ prop.row.customerCommision = (prop.row.customerCommision==''||prop.row.customerCommision===null||!prop.row.customerCommision)?0:prop.row.customerCommision
|
|
|
+ prop.row.intermediatorCommission = (prop.row.intermediatorCommission==''||prop.row.intermediatorCommission===null||!prop.row.intermediatorCommission)?0:prop.row.intermediatorCommission
|
|
|
var num= prop.row.purchasePrice/Number(formData.exchangeRate)*(1+prop.row.taxRate/100)*(1+prop.row.tariff/100)*(1-prop.row.discount/100)/(1-prop.row.grossMargin/100-prop.row.customerCommision/100-prop.row.intermediatorCommission/100)
|
|
|
+
|
|
|
prop.row.salePrice = !isNaN(num)?num.toFixed(2):''
|
|
|
if(prop.row.quantity){
|
|
|
prop.row.taxAmount = (prop.row.salePrice*prop.row.quantity).toFixed(2)
|
|
@@ -727,6 +732,8 @@
|
|
|
formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null)?1:formData.exchangeRate
|
|
|
newArr.map(item=>{
|
|
|
item.discount = (formData.custumerDiscount==''||formData.custumerDiscount===null)?formData.custumerDiscount:item.discount
|
|
|
+ item.customerCommision = (item.customerCommision==''||item.customerCommision===null||!item.customerCommision)?0:item.customerCommision
|
|
|
+ item.intermediatorCommission = (item.intermediatorCommission==''||item.intermediatorCommission===null||!item.intermediatorCommission)?0:item.intermediatorCommission
|
|
|
//汇率默认为1
|
|
|
var num= item.purchasePrice/Number(formData.exchangeRate)*(1+item.taxRate/100)*(1+item.tariff/100)*(1-item.discount/100)/(1-item.grossMargin/100-item.customerCommision/100-item.intermediatorCommission/100)
|
|
|
item.salePrice = !isNaN(num)?num.toFixed(2):''
|