diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index c0bcbf0a42..adff25d88e 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -47,78 +47,72 @@
- + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 871106dfcf..254f52120c 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -38,28 +38,28 @@ - + *收款银行账号 - + - + 收款银行名称 - + {{ formobj.receivingName }} - + *收款银行 - + {{ formobj.collectionBank }} @@ -152,28 +152,39 @@ - -
+ + + + + + + + + + + + + + + + + + + +
+
+ 查询 + 重置 +
- - - - - - - - - - - - - - -
- 查询 - 重置 -
+ 余额:
+
+
+
+ + +
应收未收款款项明细
@@ -186,7 +197,7 @@ {{ scope.row.contractNo }} - + @@ -221,15 +232,6 @@
-
- - - - -
- 余额: -
-
已选应收款项明细
@@ -242,7 +244,7 @@ {{ scope.row.contractNo }} - + @@ -257,7 +259,7 @@ {{ scope.row.customerPhone }} - + @@ -267,14 +269,14 @@ {{ scope.row.currentReceivableMoney }} - + - + @@ -437,6 +439,13 @@ export default { this.balanceCopy = this.formobj.collectionMoney } }, + changeMoney(row) { + if (row.subscriptionMoney !== '') { + row.surplusReceivable = parseFloat(row.currentReceivableMoney) - parseFloat(row.subscriptionMoney) + } else { + row.surplusReceivable = '' + } + }, changeSubscriptionMoney() { let subscriptionMoney = '0' for (var i = 0; i < this.formobj.finSelectedReceivablesDetaileds.length; i++) { @@ -612,6 +621,7 @@ export default { currentReceivableMoney: row.currentReceivableMoney, lastSubscriptionMoney: '', subscriptionMoney: '', + surplusReceivable: '', subscriptionDate: '', collSid: '', receivablesSid: row.sid, @@ -725,6 +735,9 @@ export default { diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue index bd46140ef1..0058d3cf3c 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue @@ -8,7 +8,7 @@
收款确认申请
- + 申请部门 @@ -36,90 +36,90 @@ - - 收款银行账号 + + 收款银行账号 - + - {{ formobj.collectionBankNum }} + {{ formobj.collectionBankNum }} - - 收款银行名称 + + 收款银行名称 - + - {{ formobj.receivingName }} + {{ formobj.receivingName }} - - 收款银行 + + 收款银行 - + - {{ formobj.collectionBank }} + {{ formobj.collectionBank }} - 收款金额(元) + 收款金额(元) - {{ formobj.collectionMoney }} + {{ formobj.collectionMoney }} - 收款日期 + 收款日期 - {{ formobj.collectionDate }} + {{ formobj.collectionDate }} - 收款方式 + 收款方式 - {{ formobj.collectionTypeValue }} + {{ formobj.collectionTypeValue }} - 付款方 + 付款方 - {{ formobj.payerName }} + {{ formobj.payerName }} - 付款账号后4位 + 付款账号后4位 - {{ formobj.payAccount }} + {{ formobj.payAccount }} - 付款银行 + 付款银行 - {{ formobj.payBank }} + {{ formobj.payBank }} - 备注 + 备注 - {{ formobj.remarks }} + {{ formobj.remarks }} @@ -270,4 +270,24 @@ export default { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index ec40bf6079..e103d29409 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -270,9 +270,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { @@ -389,6 +389,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService