Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhuhuichen

This commit is contained in:
user 2018-06-14 11:56:23 +08:00
commit 99b0fd3716
5 changed files with 13 additions and 5 deletions

View File

@ -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()%>");

View File

@ -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";

View File

@ -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()%>");

View File

@ -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";

View File

@ -26,9 +26,9 @@
{"false","","Button","废弃","废弃","abandon()","","","","btn_icon_delete",""},
{"true","","Button","导入Excel","导入Excel","importExcel()","","","","btn_icon_import",""},
{"true","","Button","网银模版下载","网银模版下载","ebankDownload()","","","","btn_icon_down",""},
{"true","","Button","导入Excel-平安","导入Excel-平安","importPAExcel()","","","","btn_icon_import",""},
/* {"true","","Button","导入Excel-平安","导入Excel-平安","importPAExcel()","","","","btn_icon_import",""},
{"true","","Button","导入Excel-光大","导入Excel-光大","importCEBExcel()","","","","btn_icon_import",""},
{"true","","Button","光大网银模版下载","光大网银模版下载","ebankCEBDownload()","","","","btn_icon_down",""},
{"true","","Button","光大网银模版下载","光大网银模版下载","ebankCEBDownload()","","","","btn_icon_down",""}, */
/* {"true","","Button","挂账","挂账","temporary()","","","","btn_icon_detail",""}, */
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>