From c12ebf6a58b099b419925e63cd4b131f6e04975c Mon Sep 17 00:00:00 2001
From: zhulianghua <zhulh@tenwa.com.cn>
Date: Wed, 25 Jul 2018 15:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88=E8=9E=8D?=
 =?UTF-8?q?=E8=B5=84=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 85f404891..c3cae36bc 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -780,7 +780,7 @@ function changeRateType(){
 function getRatioByMoney(e){
 	var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款
 	var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
-	var allMoney = equipAmt;
+	var allMoney = 0;
 	var fundRules=calcRules["fund"];
 	
 	for(var key in fundRules) {
@@ -798,21 +798,21 @@ function getRatioByMoney(e){
 		}
 	}
 	//得到总价款
-	setItemValue(0, 0, "TOTAL_ALL", allMoney + "");
+	setItemValue(0, 0, "TOTAL_ALL", eval(allMoney + "+" + equipAmt) + "");
 	//计算综合融资额
 	var firstPaymentRatio = getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0");
 	var ratio = 100 - Number(firstPaymentRatio);
 	if(ratio > 0 && allMoney != 0) {
-		cleanLeaseMoney = allMoney * (ratio / 100);
+		cleanLeaseMoney = equipAmt * (ratio / 100) + Number(allMoney);
 		setItemValue(0, 0, "RENT_RATIO", ((cleanLeaseMoney / equipAmt) * 100).toFixed(6));
 		setItemValue(0, 0, "CLEAN_LEASE_MONEY", cleanLeaseMoney);
 	}
+	allMoney = eval(allMoney + "+" + equipAmt);
 	
 	for(var key in fundRules){
 		var fundMoney=getItemValue(0,0,key);//金额
 		var fundRatio=getItemValue(0,0,key+"_RATIO");//  比例
 		
-		
 		var money=0;
 		if(fundRules[key]["ratioFee"]=="EquipEndAmt"&&key!="FIRST_PAYMENT"){//比例参照项
 			money=cleanLeaseMoney;