From ca9548cbda4169573ae7de93ebbc6edf95e9e4b8 Mon Sep 17 00:00:00 2001
From: linxiaoping <12345678>
Date: Thu, 14 Jun 2018 10:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp    | 2 ++
 WebContent/DealerDeposit/DDepositReturn_TempList.jsp    | 4 +++-
 WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp     | 2 ++
 WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp | 6 ++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
index ee0d3f0d4..daf5f8d4d 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@@ -7,6 +7,7 @@
     */
     String sFlowUnid = CurPage.getParameter("FlowUnid");
 	String sPrevUrl = CurPage.getParameter("ID");
+	String ProjectName = CurPage.getParameter("ProjectName");
 	/* if(sPrevUrl == null) sPrevUrl = ""; */
 
 	String sTempletNo = "DDepositReturn_TempInfo";//--模板号--
@@ -26,6 +27,7 @@
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
 	setItemValue(0,0,"MONEY_TYPE","退款");
+	setItemValue(0,0,"REFUND_PERSON","<%=ProjectName%>");
 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
 	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
 	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
diff --git a/WebContent/DealerDeposit/DDepositReturn_TempList.jsp b/WebContent/DealerDeposit/DDepositReturn_TempList.jsp
index c362016d4..23be864c8 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempList.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempList.jsp
@@ -6,6 +6,7 @@
         History Log: 
     */
 	String sFlowUnid = CurPage.getParameter("FlowUnid");
+	String ProjectName = CurPage.getParameter("ProjectName");
 	ASObjectModel doTemp = new ASObjectModel("DDepositReturn_TempList");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
@@ -23,7 +24,8 @@
 <script type="text/javascript">
 	function newRecord(){
 		 var sUrl = "/DealerDeposit/DDepositReturn_TempInfo.jsp";
-		 AsControl.OpenView(sUrl,'FlowUnid='+'<%=sFlowUnid%>','_self','');
+		 var param = "<%=ProjectName%>";
+		 AsControl.OpenView(sUrl,'FlowUnid='+'<%=sFlowUnid%>'+'&ProjectName='+param,'_self','');
 	}
 	function viewAndEdit(){
 		 var sUrl = "/DealerDeposit/DDepositReturn_TempInfo.jsp";
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 4778a3c89..e2606b4f9 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -7,6 +7,7 @@
     */
 	String sFlowUnid = CurPage.getParameter("FlowUnid");
 	String sPrevUrl = CurPage.getParameter("ID");
+	//String ProjectName = CurPage.getParameter("ProjectName");
 /* 	if(sPrevUrl == null) sPrevUrl = "/DealerDeposit/DMarginChargeInfo_TempList.jsp"; */
 
 	String sTempletNo = "DMarginChargeInfo_Temp";//--模板号--
@@ -25,6 +26,7 @@
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
 	setItemValue(0,0,"MONEY_TYPE","收款");
+	setItemValue(0,0,"PAYER","<%=CurPage.getParameter("ProjectName")%>");
 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
 	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
 	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp
index 89df303f2..7328f7ca9 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp
@@ -5,7 +5,8 @@
         Content: 
         History Log: 
     */
-	String sFlowUnid = CurPage.getParameter("FlowUnid");
+	String sFlowUnid = CurPage.getParameter("FlowUnid");	
+	String ProjectName = CurPage.getParameter("ProjectName");
 	ASObjectModel doTemp = new ASObjectModel("DMarginChargeInfo_TempList");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
@@ -23,7 +24,8 @@
 <script type="text/javascript">
 	function newRecord(){
 		 var sUrl = "/DealerDeposit/DMarginChargeInfo_Temp.jsp";
-		 AsControl.OpenView(sUrl,'FlowUnid='+'<%=sFlowUnid %>','_self','');
+		 var param = '<%=ProjectName%>';
+		 AsControl.OpenView(sUrl,'FlowUnid='+'<%=sFlowUnid %>'+'&ProjectName='+param,'_self','');
 	}
 	function viewAndEdit(){
 		 var sUrl = "/DealerDeposit/DMarginChargeInfo_Temp.jsp";