diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp index 844166e23..e0f2b9895 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp @@ -752,6 +752,7 @@ function changeRateType(){ //根据金额算比例 function getRatioByMoney(e){ + debugger; if(e.value === "") { setItemValue(0, 0, e.id, "0"); } @@ -760,8 +761,8 @@ function getRatioByMoney(e){ var fundRules = calcRules["fund"]; var firstPayment = getItemValue(0,0,"FIRST_PAYMENT");//首付款 //计算总价款 - var allMoney = Number(equipAmt) + Number(getItemValue(0, 0, "INSURANCE_PREMIUM")) + Number(getItemValue(0, 0, "OTHER_MONEY")) + Number(getItemValue(0, 0, "GPS_FEE"))+ Number(getItemValue(0, 0, "PURCHASE_TAX"))- Number(getItemValue(0, 0, "UNITE_MONEY")); - if(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) { + var allMoney = Number(equipAmt) + Number(getItemValue(0, 0, "INSURANCE_PREMIUM")) + Number(getItemValue(0, 0, "OTHER_MONEY")) + Number(getItemValue(0, 0, "GPS_FEE"))+ Number(getItemValue(0, 0, "PURCHASE_TAX")); + if(Number(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0"))!=0) { var calcMoney = 0; if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//比例参照项 calcMoney = cleanLeaseMoney; @@ -771,23 +772,25 @@ function getRatioByMoney(e){ calcMoney = equipAmt; } firstPayment = Number(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) / 100 * Number(calcMoney); - } else { + }else if(e.id=="FIRST_PAYMENT"){ + + }else{ firstPayment = 0; } setItemValue(0, 0, "TOTAL_ALL", allMoney + ""); - for(var key in fundRules){ if(key=="EQUIP_AMT"){ continue; } var fundMoney=getItemValue(0,0,key);//金额 var fundRatio=getItemValue(0,0,key+"_RATIO");// 比例 - var fundFina=getItemValue(0,0,key+"_FINA");// 是否参与融资 + //安鹏要求不用是否参与融资,这几个字段填写了就是参与,不填就是不参与。所以暂时先注释掉。 + /* var fundFina=getItemValue(0,0,key+"_FINA");// 是否参与融资 if(fundFina == "finatype02" || fundFina == "finatype03"){ setItemValue(0,0,"CLEAN_LEASE_MONEY",Number(cleanLeaseMoney)+Number(fundMoney)); cleanLeaseMoney = Number(cleanLeaseMoney)+Number(fundMoney); - } - + } */ + cleanLeaseMoney = allMoney - firstPayment; var money=0; if(fundRules[key]["ratioFee"]=="EquipEndAmt"){//比例参照项 money=cleanLeaseMoney; @@ -823,7 +826,8 @@ function getRatioByMoney(e){ } } //计算融资额 - cleanLeaseMoney = allMoney - firstPayment; + uniteMoney = getItemValue(0,0,"UNITE_MONEY"); + cleanLeaseMoney = allMoney - firstPayment-uniteMoney; setItemValue(0, 0, "CLEAN_LEASE_MONEY", cleanLeaseMoney + ""); cautionMoney(); } diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp index 7c2d136cd..46f5b293e 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp @@ -5,7 +5,17 @@