diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
index a28ebe41a..a55984089 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
@@ -22,16 +22,16 @@
 	String nodeNo=CurPage.getParameter("NodeNo");
 	String RightType= CurPage.getParameter("RightType");
 	String contractId = CurPage.getParameter("ContractId");
-	String param = flowunid;
+	String sParam = flowunid;
+	String name = "condition_plan_business";
 	String sTempletNo = "LoanSimulationBasicInfoBusiness";//--模板号--
 	if("FundPaymentFlow".equals(flowNo)){
 		RightType="ReadOnly";
 		sTempletNo = "LoanSimulationBusiness_Query";
-		param = contractId;
+		sParam = contractId;
+		name = "conditionQuery_plan";
 	}
 	String calType = CurPage.getParameter("calType");
-	//判断是否为汽车业务
-	boolean isCarProduct = "004".equals(productId) ? false : true;
 	/*获取参数*/
 	/*根据参数判断   是否去数据库查询*/
 	BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);
@@ -117,9 +117,12 @@
 	doTemp.setDefaultValue(planCName, plannumber);
 	doTemp.setDefaultValue("flowunid", flowunid);
 	doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'");
-	if(null!=ishistory&&ishistory.equals("true")){
+	if(!"FundPaymentFlow".equals(flowNo)){
+		 if(null!=ishistory&&ishistory.equals("true")){
 		 doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据
+		} 
 	}
+	
 	/*设置模板属性*/
 	
 	/*设置页面属性*/
@@ -144,11 +147,13 @@
 	dwTemp.setAttr("inputWidth","120");
 	dwTemp.setAttr("spanWidth","107");
 	dwTemp.setAttr("showRatio", true);
-	dwTemp.genHTMLObjectWindow(param);
+	dwTemp.genHTMLObjectWindow(sParam);
 	CurPage.getCurComp().setAttribute("RightType", RightType);
 	
 	String compClientID = request.getParameter("CompClientID");
-	dwTemp.replaceColumn("condition_plan", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"600px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/condition_plan_business.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&ProductId="+productId+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput()); 
+	
+	
+	dwTemp.replaceColumn("condition_plan", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"600px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/"+name+".jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&ProductId="+productId+"&calType="+calType+"&sTempletNo="+sTempletNo+"\"></iframe>", CurPage.getObjectWindowOutput()); 
 	dwTemp.replaceColumn("even_subsection", "<iframe type='iframe' id='frame_even_break' name=\"frame_even_subsection\" width=\"100%\" height=\"300px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/subsection/LCCalcSubsectionList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput()); 
 	dwTemp.replaceColumn("knowing_config", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"400px\" frameborder=\"0\" src=\""+sWebRootPath+"/Accounting/LoanSimulation/KnowConfigList.jsp?CompClientID="+compClientID+"&flowunid="+flowunid+"&plannumber="+plannumber+"&planCName="+planCName+"&IsHistory="+ishistory+"NodeNo="+nodeNo+"&RightType="+RightType+"&calType="+calType+"\"></iframe>", CurPage.getObjectWindowOutput());
 	String businessDate = DateHelper.getBusinessDate();
diff --git a/WebContent/Accounting/LoanSimulation/conditionQuery_plan.jsp b/WebContent/Accounting/LoanSimulation/conditionQuery_plan.jsp
index 7d1f5f93c..515a4946e 100644
--- a/WebContent/Accounting/LoanSimulation/conditionQuery_plan.jsp
+++ b/WebContent/Accounting/LoanSimulation/conditionQuery_plan.jsp
@@ -3,14 +3,19 @@
 <%
 	String contractId = CurPage.getParameter("ContractId");
 	String projectid=CurPage.getParameter("ProjectId");
+	String sTempletNo=CurPage.getParameter("sTempletNo");
 	
 	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
 // 	String userid = CurUser.getUserID();
 	String orgid = CurUser.getOrgID();
+	String flag = "8009012002,8009001".indexOf(orgid)>-1?"true":"false";
+	if("LoanSimulationBusiness_Query".equals(sTempletNo)){
+		flag ="true";
+	}
 	String sTabStrip[][] = {
 		{"true", "租金计划", "/Accounting/LoanSimulation/RentPlanQueryList.jsp","ContractId="+contractId+"&ProjectId="+projectid, "", "", "false"},
-		{"8009012002,8009001".indexOf(orgid)>-1?"true":"false", "资金计划", "/Accounting/LoanSimulation/FundPlanQueryList.jsp","ContractId="+contractId+"&ProjectId="+projectid, "", "", "false"},
-		{"8009012002,8009001".indexOf(orgid)>-1?"true":"false", "现金流", "/Accounting/LoanSimulation/CashFlowQueryList.jsp","ContractId="+contractId+"&ProjectId="+projectid, "", "", "false"},
+		{flag, "资金计划", "/Accounting/LoanSimulation/FundPlanQueryList.jsp","ContractId="+contractId+"&ProjectId="+projectid, "", "", "false"},
+		{flag, "现金流", "/Accounting/LoanSimulation/CashFlowQueryList.jsp","ContractId="+contractId+"&ProjectId="+projectid, "", "", "false"},
 	};
 %>
 <%@ include file="/Resources/CodeParts/Tab01.jsp"%>