|
|
|
@ -1072,9 +1072,17 @@
|
|
|
|
|
var advance = 0
|
|
|
|
|
var notPrice = 0
|
|
|
|
|
for (let i = 0; i < list.length; i++) {
|
|
|
|
|
// this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
|
|
|
|
|
if(list[i].salesPrice != null){
|
|
|
|
|
this.dataForm.salesorder_item0List[i].unitPrice = list[i].unitPrice;
|
|
|
|
|
}else{
|
|
|
|
|
this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
|
|
|
|
|
}
|
|
|
|
|
this.dataForm.salesorder_item0List[i].poundlistId = list[i].id
|
|
|
|
|
if(list[i].price != null){
|
|
|
|
|
this.dataForm.salesorder_item0List[i].price = list[i].price.toFixed(2)
|
|
|
|
|
}else{
|
|
|
|
|
this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].unitPrice, list[i].settlement).toFixed(2)
|
|
|
|
|
}
|
|
|
|
|
this.rateOptions.find((item) => {
|
|
|
|
|
if (this.dataForm.salesorder_item0List[i].rate == item.id) {
|
|
|
|
|
this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.fullName,100))).toFixed(2)
|
|
|
|
@ -1082,7 +1090,7 @@
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
if (list[i].advance == 1) {
|
|
|
|
|
advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)).toFixed(2)
|
|
|
|
|
advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].unitPrice, list[i].settlement)).toFixed(2)
|
|
|
|
|
}
|
|
|
|
|
num = this.jnpf.floatAdd(num, list[i].settlement)
|
|
|
|
|
amount = this.jnpf.floatAdd(amount, list[i].price)
|
|
|
|
|