From cdb82060e9c04ed15799aed9237bc9c7a7a18f5b Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 7 Mar 2019 17:19:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BA=A7=E5=93=81=E6=9C=9F=E9=99=90=E8=83=BD?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=EF=BC=8C12=E3=80=8124=E3=80=8136=E3=80=8148?=
 =?UTF-8?q?=E3=80=8160=E4=BE=9B=E9=80=89=E6=8B=A9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanSimulation/LoanBasicInfo.jsp           | 18 ++++++++++++++++++
 .../CautionMoneyDeduction/ContractInfoPay.jsp  |  2 --
 .../component/component-parameter-config.xml   |  2 +-
 .../tenwa/reckon/product/ProductCondition.java | 18 ++++++++++++++++--
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index db9bc53e7..447b1294c 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -193,6 +193,7 @@ var calcRules=eval("(<%=calcRules%>)");
 var rentOrRateOption;
 var incomeNumberYear;
 var adjustType;
+var incomeNumber;
 var count = 0;
 $(function(){
 	changgeCompare();
@@ -202,6 +203,7 @@ $(function(){
 		rentOrRateOption=$("#RENT_OR_RATE").children();
 		incomeNumberYear=$("#INCOME_NUMBER_YEAR").children();
 		adjustType=$("#ADJUST_TYPE").children();
+		incomeNumber=$("#INCOME_NUMBER").children();
 		var fundRules=calcRules["fund"];
 		for(var key in fundRules){
 			$("#"+key).bind("change",function(){
@@ -223,6 +225,22 @@ $(function(){
 		//changeRateType();
 		//CalcControl.RentOrRateView();
 		
+		var inerNumber = $("#INCOME_NUMBER").val();
+		$("#INCOME_NUMBER").empty();
+		var inNumber=calcRules['incomeNumber']['INCOME_NUMBER'];
+		inNumber=inNumber.split(",");
+		var inco={};
+		for(var i=0;i<inNumber.length;i++){
+			inco[inNumber[i]]="1";
+		}
+		$(incomeNumber).each(function(){
+			var value=$(this).attr("value");
+			if(inco[value]==1){
+				$("#INCOME_NUMBER").append(this);
+			}
+		}); 
+		$("#INCOME_NUMBER").val(inerNumber);
+	
 		count++;
 	}else{ 
 		changeSettleMethod3();
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index bf35b7214..7898856e6 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -47,8 +47,6 @@ window.onload = function(){
 		}else{
 			if("<%=phaseNo%>"=="0020"){
 				setItemReadOnly(0,0,"has_gps", false);
-				
-			//	setItemValue(0, 0, "has_gps", "Y");
 			}
 		}
 }
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 9d23714ee..b02c4ab66 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -167,7 +167,7 @@
 	<Parameter COMPONENTTYPE="PRD0381" DATATYPE="5" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="AdvanceInvoicing" PARAMETERNAME="提前开票天数" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0380" DATATYPE="5" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,MAXIMUMVALUE,VALUE" PARAMETERID="DefaultValue" PARAMETERNAME="默认值" STATUS="1"/>
 	<Parameter CODESCRIPT="residual_method" CODESOURCE="Code" COMPONENTTYPE="PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ResidualMethod" PARAMETERNAME="残值处理方式" SELECTTYPE="05" STATUS="1"/>
-	<Parameter CODESCRIPT="INCOME_NUMBER" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="5" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="INCOME_NUMBER" PARAMETERNAME="租赁期限" SELECTTYPE="04" STATUS="1"/>
+	<Parameter CODESCRIPT="INCOME_NUMBER" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="OPTIONALVALUE" PARAMETERID="INCOME_NUMBER" PARAMETERNAME="租赁期限" SELECTTYPE="06" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0380" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="EndValueRatio" PARAMETERNAME="残值比例限定" STATUS="1" UNIT="&lt;font&gt;%&lt;/font&gt;"/>
 	<Parameter CODESCRIPT="yes_no" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款（汽车专用）" SELECTTYPE="05" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteeName" PARAMETERNAME="担保人名称" STATUS="1"/>
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index df84939e2..ee628bebd 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -39,6 +39,7 @@ public class ProductCondition {
 		sb.append("'fund':"+getProductFundRules(doTemp, productId,vali));//资金配置项
 		sb.append(",'grace':"+this.getProductGraceRules(doTemp, productId, vali));//宽限期
 		sb.append(",'method':"+this.getProductSettleRules(doTemp, productId));//计算方式
+		sb.append(",'incomeNumber':"+this.getIncomeNumber(productId));
 		sb.append("}");
 		setRentOrRate(doTemp, productId);//租金推算方法
 		this.getOtherRule(doTemp, productId);//其它配置
@@ -930,6 +931,19 @@ public class ProductCondition {
 		}
 		return s;
 	}
+	
+	public String getIncomeNumber(String productId) throws Exception{
+		StringBuilder sb=new StringBuilder();
+		sb.append("{");
+		Map<String, String> productRate = ProductParamUtil.getProductComponentType(productId, "PRD0350").get("product_rate");
+		if(productRate != null) {
+			String incomeNumbers = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER");
+			sb.append("'INCOME_NUMBER':'"+incomeNumbers+"'");
+		}
+		sb.append("}");
+		return sb.toString();
+	}
+	
 	//获取期数等
 	public void getCautionRatio(ASObjectModel doTemp,String productId) throws Exception{
 		//测算年利率字段
@@ -939,8 +953,8 @@ public class ProductCondition {
 		periodType = periodType == null ? "period_type_0" : periodType;
 		doTemp.setDefaultValue("PERIOD_TYPE",periodType);
 		if(productRate != null) {
-			String incomeNumber = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER");
-			doTemp.setDefaultValue("INCOME_NUMBER",incomeNumber);
+		//	String incomeNumber = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER");
+		//	doTemp.setDefaultValue("INCOME_NUMBER",incomeNumber);
 			/*String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end");
 			doTemp.setDefaultValue("PERIOD_TYPE",periodType)*/;