From 826ec4f1072bc9b1a5cd7630249a541e98f70eb4 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Wed, 5 Feb 2020 20:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=90=8E=EF=BC=8C=E5=8E=9F=E5=95=86=E5=8A=A1=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanSimulation_old/RentPlanList.jsp        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp b/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp
index d3b884b5f..74cfc1d32 100644
--- a/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp
+++ b/WebContent/Accounting/LoanSimulation_old/RentPlanList.jsp
@@ -1,9 +1,14 @@
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
-	String paymentnumber = CurPage.getParameter("plannumber");
-	ASObjectModel doTemp = new ASObjectModel("LCRentPlanList");
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+
 	String ishistory=CurPage.getParameter("IsHistory");
+	String sTempletNo = "LCRentPlanList";//--模板号--
+	if(null!=ishistory&&ishistory.equals("true")){
+		sTempletNo = "LCRentPlanListHis";
+	}
+	String paymentnumber = CurPage.getParameter("plannumber");
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	String nodeNo=CurPage.getParameter("NodeNo");
 	if(null!=ishistory&&ishistory.equals("true")){
 		 //doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");//如果是历史则新显示历史数据
@@ -15,8 +20,11 @@
 	dwTemp.Style="1";     
 	dwTemp.ReadOnly = "1"; 
 	dwTemp.setPageSize(100);
-		
-	dwTemp.genHTMLObjectWindow(paymentnumber);
+	if(null!=ishistory&&ishistory.equals("true")){
+		dwTemp.genHTMLObjectWindow(paymentnumber+","+CurPage.getParameter("flowunid"));
+	}else{
+		dwTemp.genHTMLObjectWindow(paymentnumber);
+	}
 	String sButtons[][] = {
 	};