|
@@ -483,7 +483,8 @@
|
|
|
customerOption.value.push({
|
|
|
label: item.name,
|
|
|
value: item.id,
|
|
|
- priority:item.priority
|
|
|
+ priority:item.priority,
|
|
|
+ intermediatorCommission:item.intermediatorCommission
|
|
|
})
|
|
|
})
|
|
|
}
|
|
@@ -573,6 +574,10 @@
|
|
|
}
|
|
|
//新增行-产品明细-选择供应商报价单
|
|
|
async function addProductFromSupplier(data){
|
|
|
+ //查询客户名称
|
|
|
+ var obj = await SelectProjectModalRef.value.getCustom(data[0].inquiryProject)
|
|
|
+ formData.quotationCustomer =obj.length==0?'':obj[0].customerId
|
|
|
+ formData.quotationCustomerName =obj.length==0?'':obj[0].customerId_dictText
|
|
|
data.map(item=>{
|
|
|
item.productClass = item.productClass
|
|
|
item.productCode = item.productCode
|
|
@@ -584,6 +589,11 @@
|
|
|
item.supplierName = item.selectionSupplier_dictText
|
|
|
item.purchasePrice = item.taxPrice
|
|
|
item.taxAmount = 0
|
|
|
+ customerOption.value.map(event=>{
|
|
|
+ if(event.value==formData.quotationCustomer){
|
|
|
+ item.intermediatorCommission = event.intermediatorCommission
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
|
|
|
saleQuotationFormProductTable.dataSource=arrProduct
|
|
@@ -595,10 +605,7 @@
|
|
|
formData.model = data[0].headModel
|
|
|
formData.maker = data[0].maker
|
|
|
formData.productionClass = data[0].productionClass
|
|
|
- //查询客户名称
|
|
|
- var obj = await SelectProjectModalRef.value.getCustom(formData.quotationProject)
|
|
|
- formData.quotationCustomer =obj[0].customerId
|
|
|
- formData.quotationCustomerName =obj[0].customerId_dictText
|
|
|
+
|
|
|
}
|
|
|
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'){
|