Commit 2103425a authored by zhengke's avatar zhengke

修改财务bug

parent ccd87f2e
...@@ -1528,7 +1528,6 @@ export default { ...@@ -1528,7 +1528,6 @@ export default {
if(x.ID==i){ if(x.ID==i){
if (type) { if (type) {
this.payMsgList[index].Account = x.allName; this.payMsgList[index].Account = x.allName;
console.log(x)
this.payMsgList[index].CurrenName =x.CurrencyName; this.payMsgList[index].CurrenName =x.CurrencyName;
this.payMsgList[index].Rate = x.PayRate; this.payMsgList[index].Rate = x.PayRate;
this.payMsgList[index].CurrencyId = x.CurrencyId; this.payMsgList[index].CurrencyId = x.CurrencyId;
...@@ -1536,7 +1535,6 @@ export default { ...@@ -1536,7 +1535,6 @@ export default {
this.Calculation(1, index); this.Calculation(1, index);
} else { } else {
this.payMsg.Account = x.allName; this.payMsg.Account = x.allName;
console.log(x)
this.payMsg.CurrenName =x.CurrencyName; this.payMsg.CurrenName =x.CurrencyName;
this.payMsg.Rate = x.PayRate; this.payMsg.Rate = x.PayRate;
this.payMsg.CurrencyId = x.CurrencyId; this.payMsg.CurrencyId = x.CurrencyId;
...@@ -1762,7 +1760,12 @@ export default { ...@@ -1762,7 +1760,12 @@ export default {
// } // }
// } // }
// }); // });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList; this.AuditOrRefundMsg.TradeDetailList = [];
this.GetDetail.TradeDetailList.forEach(x=>{
if(x.isChecked){
this.AuditOrRefundMsg.TradeDetailList.push(x);
}
})
// if(this.allMoney!=this.currentMoney){ // if(this.allMoney!=this.currentMoney){
// this.Error('原路退款金额与单据总金额不一致'); // this.Error('原路退款金额与单据总金额不一致');
// return; // return;
...@@ -1982,7 +1985,21 @@ export default { ...@@ -1982,7 +1985,21 @@ export default {
Trade_Order:subItem.Trade_Order, Trade_Order:subItem.Trade_Order,
show: false show: false
} }
this.payMsgList.push(payMsg); if(this.payMsgList.length==0){
this.payMsgList.push(payMsg);
}else{
var isPush =false;
this.payMsgList.forEach(x=>{
if(x.Trade_Order==subItem.Trade_Order){
isPush=true;
x.OriginalMoney = subItem.RefundMoney;
x.allMoney = subItem.RefundMoney;
}
})
if(!isPush){
this.payMsgList.push(payMsg);
}
}
let total = 0; let total = 0;
this.payMsgList.forEach(x=>{ this.payMsgList.forEach(x=>{
total +=parseFloat(x.OriginalMoney); total +=parseFloat(x.OriginalMoney);
......
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