From 452eff2b41227db3297e04a6ca161c23b6650341 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 5 Jun 2018 13:03:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=A4=84=E7=BD=AE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowBussinessView/CommFlowView.jsp | 4 ++- .../FlowManager/FlowPage/FlowPageViewTab.jsp | 2 ++ .../AssetsDisposalApplyList.jsp | 1 + .../CarManage/CarDispose/LcCarDisposeInfo.jsp | 33 +++++++++++++++++++ .../Flow/Comm/LBContract/LBContractInfo.jsp | 2 ++ .../AssetsDisposalStartAction.java | 9 +++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeInfo.jsp diff --git a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/CommFlowView.jsp b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/CommFlowView.jsp index 4acf9b292..3b093b982 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/CommFlowView.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowBussinessView/CommFlowView.jsp @@ -33,7 +33,9 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=View02;Describe=定义变量，获取参数;]~*/%> <% - HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(CurPage.getParameter("TaskNo"),CurPage); + HashMapFlowFixedParam=GetFlowAction.getFlowParamByTask(CurPage.getParameter("TaskNo"),CurPage); + + FlowFixedParam.putAll(GetFlowAction.getFlowParamByFlowUnid(FlowFixedParam.get("ObjectNo"))); BizObject flowModel = GetFlowAction.getFlowModelParams(FlowFixedParam.get("FlowNo"),FlowFixedParam.get("PhaseNo")); //任务配置 String isPageRead=flowModel.getAttribute("ISREADONLY").getString(); //业务页面是否只读 if(null!=isPageRead&&isPageRead.endsWith("Y")){ diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp index 70b19df8d..04ffe6df5 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp @@ -141,6 +141,8 @@ $(function(){ paramJson["CUSTOMERTYPE"]="<%=startMap.get("CUSTOMERTYPE")%>"; paramJson["CustomerNature"]="<%=startMap.get("CustomerNature")%>"; paramJson["CUSTOMERID"]="<%=startMap.get("CUSTOMERID")%>"; + paramJson["ContractId"]="<%=startMap.get("ContractId")%>"; + //paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>"; //paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>"; //paramJson["Assignfinish"]="<%=FlowFixedParam.get("Assignfinish")%>"; diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp index 1b8987289..b60df3817 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp @@ -20,6 +20,7 @@ var customer_id = sReturn[6]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; sParams =sParams+",ProductId="+product_id+",ProjectId="+project_id+",ContractId="+contract_id+",ProjectName="+project_name+",FlowKey="+payment_number+",PaymentNumber="+payment_number+",ContractNumber="+contract_number+",CustomerId="+customer_id; + // alert(sParams); var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.assetsdisposal.assetsdisposalapply.AssetsDisposalStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeInfo.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeInfo.jsp new file mode 100644 index 000000000..f8bae1f32 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeInfo.jsp @@ -0,0 +1,33 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-06-04 + Content: 示例详情页面 + History Log: + */ + String contractId = CurPage.getParameter("ContractId"); + String sPrevUrl = CurPage.getParameter("PrevUrl"); +/* String sFlowUnid = CurPage.getParameter("FlowUnid"); + if(sFlowUnid == null) sFlowUnid = ""; + alert(sFlowUnid); */ + if(sPrevUrl == null) sPrevUrl = ""; + String sTempletNo = "LcCarDisposeInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + //doTemp.setColTips("", "测试"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(contractId); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp index d8ae3580b..b23666a7f 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp @@ -26,6 +26,8 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%> <% + + String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String IsShowFormal = CurPage.getParameter("IsShowFormal");//流程编号 diff --git a/src_tenwa/com/tenwa/lease/flow/assetsdisposal/assetsdisposalapply/AssetsDisposalStartAction.java b/src_tenwa/com/tenwa/lease/flow/assetsdisposal/assetsdisposalapply/AssetsDisposalStartAction.java index b47201dd8..8bfb1a0c1 100644 --- a/src_tenwa/com/tenwa/lease/flow/assetsdisposal/assetsdisposalapply/AssetsDisposalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/assetsdisposal/assetsdisposalapply/AssetsDisposalStartAction.java @@ -6,9 +6,18 @@ import com.tenwa.flow.action.comm.BaseFlowStartAction; import com.tenwa.util.SerialNumberUtil; public class AssetsDisposalStartAction extends BaseFlowStartAction{ + private String ContractId; @Override public void customOperation(JBOTransaction tx, BizObject flowBussiness)throws Exception { String applyNo = SerialNumberUtil.getAssetsDisposalApplyNo(tx); this.FlowParam.put("ApplyNo", applyNo); + this.FlowParam.put("ContractId", this.getContractId()); } + public String getContractId() { + return ContractId; + } + public void setContractId(String contractId) { + ContractId = contractId; + } + }