Commit 9339cc69 authored by 我在何方's avatar 我在何方

收款单修复

parent 8fb403ea
...@@ -893,7 +893,7 @@ export default { ...@@ -893,7 +893,7 @@ export default {
var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id) var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
if(dollarList.length>0){ if(dollarList.length>0){
var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6) var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar}) amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
} }
}) })
// const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1) // const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
......
...@@ -644,7 +644,7 @@ export default { ...@@ -644,7 +644,7 @@ export default {
// if(n && n.discountTotal&&n.discountTotal>0){ // if(n && n.discountTotal&&n.discountTotal>0){
// amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)}) // amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)})
// }else{ // }else{
amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar}) amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
// } // }
} }
...@@ -953,6 +953,7 @@ export default { ...@@ -953,6 +953,7 @@ export default {
this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => { this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
collom[item.currencyId] = item.amount collom[item.currencyId] = item.amount
}) })
console.log(this.form.receiptAccountList)
console.log('collom',collom) console.log('collom',collom)
// if(recepted.length>collom.length){ // if(recepted.length>collom.length){
recepted.forEach((amount,currency)=>{ recepted.forEach((amount,currency)=>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment