diff --git a/WebContent/DealerDeposit/DDepositReturn_HisList.jsp b/WebContent/DealerDeposit/DDepositReturn_HisList.jsp index f6032ba4e..dd332590c 100644 --- a/WebContent/DealerDeposit/DDepositReturn_HisList.jsp +++ b/WebContent/DealerDeposit/DDepositReturn_HisList.jsp @@ -5,12 +5,13 @@ Content: History Log: */ + String DistributorNo = CurPage.getParameter("DistributorNo"); ASObjectModel doTemp = new ASObjectModel("DDepositReturn_HisList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); + dwTemp.genHTMLObjectWindow(DistributorNo); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp index 0847495db..59d33074e 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_HisList.jsp @@ -5,12 +5,13 @@ Content: History Log: */ + String DistributorNo = CurPage.getParameter("DistributorNo"); ASObjectModel doTemp = new ASObjectModel("DMarginChargeInfo_HisList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); + dwTemp.genHTMLObjectWindow(DistributorNo); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp index b14fcfd9d..baae49fa6 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp @@ -7,8 +7,10 @@ */ String sFlowUnid = CurPage.getParameter("FlowUnid"); String sPrevUrl = CurPage.getParameter("id"); + String DistributorNo = CurPage.getParameter("DistributorNo"); String sTempletNo = "DMarginChargeInfo_Temp";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setDefaultValue("DISTRIBUTOR_ID", DistributorNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); @@ -33,7 +35,6 @@ function save(){ var sFlowUnid = "<%=sFlowUnid%>"; setItemValue(0,getRow(),"FlowUnid",sFlowUnid);//初始化流程编号 - setItemValue(0,getRow(),"DISTRIBUTOR_ID","<%=sPrevUrl%>");//初始化流程编号 as_save("myiframe0","returnList()"); } function returnList(){ diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp index baa5dff92..81a352c34 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp @@ -8,6 +8,7 @@ String sFlowUnid = CurPage.getParameter("FlowUnid"); String ProjectName = CurPage.getParameter("ProjectName"); String id = CurPage.getParameter("ProjectId"); + String DistributorNo = CurPage.getParameter("DistributorNo"); ASObjectModel doTemp = new ASObjectModel("DMarginChargeInfo_TempList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- @@ -26,7 +27,8 @@ function newRecord(){ var sUrl = "/DealerDeposit/DMarginChargeInfo_Temp.jsp"; var param = '<%=ProjectName%>'; - AsControl.OpenView(sUrl,"id=<%=id%>&FlowUnid=<%=sFlowUnid %>&ProjectName="+param,'_self',''); + var DistributorNo='DistributorNo=<%=DistributorNo%>'; + AsControl.OpenView(sUrl,"id=<%=id%>&FlowUnid=<%=sFlowUnid %>&ProjectName="+param+"&"+DistributorNo,'_self',''); } function viewAndEdit(){ var sUrl = "/DealerDeposit/DMarginChargeInfo_Temp.jsp"; diff --git a/WebContent/Flow/DealerDepositChargeApplyList.jsp b/WebContent/Flow/DealerDepositChargeApplyList.jsp index da6a2c25a..5925614f1 100644 --- a/WebContent/Flow/DealerDepositChargeApplyList.jsp +++ b/WebContent/Flow/DealerDepositChargeApplyList.jsp @@ -12,8 +12,9 @@ sReturn = sReturn.split("@"); var id = sReturn[0]; var distributor_name = sReturn[1]; + var distributor_no = sReturn[4]; var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",FlowKey="+id+",ProjectId="+id+",ProjectName="+distributor_name; + sParams =sParams+",FlowKey="+id+",ProjectId="+id+",ProjectName="+distributor_name+",DistributorNo="+distributor_no; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@");