diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index fe917c2b1..572077ce2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -517,6 +517,7 @@ + diff --git a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp index 0a9e5219d..7f87508e2 100644 --- a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp +++ b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackInfo.jsp @@ -9,6 +9,7 @@ String secondOverdueInterest = CurPage.getParameter("secondOverdueInterest"); String overdueList = CurPage.getParameter("overdueList"); String voucherStatus = CurPage.getParameter("voucherStatus"); + String allRemainMoney = CurPage.getParameter("allRemainMoney"); String readOnly = "0"; if("1".equals(voucherStatus)){ readOnly="1"; @@ -35,20 +36,18 @@ setItemValue(0,0,"SECOND_OVERDUE_CORPUS","<%=secondOverdueCorpus%>"); setItemValue(0,0,"SECOND_OVERDUE_INTEREST","<%=secondOverdueInterest%>"); setItemValue(0,0,"OVERDUE_LIST","<%=overdueList%>"); + setItemValue(0,0,"ALL_REMAIN_MONEY","<%=allRemainMoney%>"); } } function returnList(){ AsControl.OpenComp("com/tenwa/apzl/settleLoan/FcBuyBackList.jsp","","_self",""); } function save(){ - var firstOverdueCorpus = getItemValue(0,0,"FIRST_OVERDUE_CORPUS"); - var firstOverdueInterest = getItemValue(0,0,"FIRST_OVERDUE_INTEREST"); - var secondOverdueCorpus = getItemValue(0,0,"SECOND_OVERDUE_CORPUS"); - var secondOverdueInterest = getItemValue(0,0,"SECOND_OVERDUE_INTEREST"); + var allRemainMoney = getItemValue(0,0,"ALL_REMAIN_MONEY"); var firstOverduePenalty = getItemValue(0,0,"FIRST_OVERDUE_PENALTY"); var secondOverduePenalty = getItemValue(0,0,"SECOND_OVERDUE_PENALTY"); var buybackMoney = getItemValue(0,0,"BUYBACK_MONEY"); - var buybackMoneySum = eval(firstOverdueCorpus +"+"+ firstOverdueInterest +"+"+ secondOverdueCorpus +"+"+ secondOverdueInterest +"+"+ firstOverduePenalty +"+"+ secondOverduePenalty) ; + var buybackMoneySum = eval( allRemainMoney +"+"+ firstOverduePenalty +"+"+ secondOverduePenalty) ; if(buybackMoney!=buybackMoneySum.toFixed(2)){ alert("本金利息罚息金额相加总额"+buybackMoneySum+"与所填‘回购总金额’不相等"); return; diff --git a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp index 40d1491d8..1edbfd0f3 100644 --- a/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp +++ b/WebContent/com/tenwa/apzl/settleLoan/FcBuyBackList.jsp @@ -16,7 +16,7 @@ String sButtons[][] = { {"true","","Button","新增","新增","newRecord()","","","","btn_icon_detail",""}, {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""}, - {"true","","Button","删除","删除","do_delete()","","","","btn_icon_delete",""}, + {"true","","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>