diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index 27f00c4a..9be01926 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -48,6 +48,7 @@ + diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue index 697562fe..c0d2771c 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue @@ -133,7 +133,7 @@ 收款金额 - + @@ -244,12 +244,12 @@
- 确 定 + 确 定 取 消
-
+
@@ -446,9 +446,9 @@ export default { this.form.payInvoiceRelList.push({applySeqNo:itemBill.applySeqNo}); } - totalFee=origFee; + // totalFee=origFee; - this.form.payMoney = totalFee.toFixed(2); + // this.form.payMoney = totalFee.toFixed(2); this.form.settleBillNo=settleBillNoListStr; @@ -461,7 +461,6 @@ export default { hasPayMap[item.billNo] = item.sumMoney } } - console.log("===>hasPayMap==>",hasPayMap); let qParam={ applySeqNo: applySeqNoListStr, @@ -471,14 +470,12 @@ export default { // 查询子账单 let res=await listEmisSettleInvoiceRel(qParam); - console.log("===>=res==>",res) if(res.code==200){ res.rows.forEach(itemSubBill=>{ let relItem={...itemSubBill}; relItem.openMoney=itemSubBill.money; relItem.payMoney=itemSubBill.money; relItem.hasApplyFee=0; - console.log("===>=hasPayMap1111==>",hasPayMap[itemSubBill.billNo]) if(relItem.waybillDetail.paymentType == 2 || relItem.waybillDetail.paymentType == 4 || relItem.waybillDetail.paymentType == 5){ that.form.settleType='2'; @@ -491,15 +488,17 @@ export default { if(this.form.recType==1){ relItem.hasApplyFee=hasPayMap[itemSubBill.billNo]; // relItem.payMoney=itemSubBill.money-hasPayMap[itemSubBill.billNo]; + relItem.payMoney=itemSubBill.money-itemSubBill.recedMoney; } } - + if(relItem.payMoney>0){ + totalFee = Number(totalFee) + Number(relItem.payMoney); this.form.payRelList.push(relItem); } }); - } + this.form.payMoney = totalFee.toFixed(2); // this.handleCalcFeeItem(); }else{