diff --git a/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp b/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp index b6ddc99c2..5974c6971 100644 --- a/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp +++ b/WebContent/AppConfig/FlowManage/FlowUserConfig/flowUserSelect.jsp @@ -15,7 +15,7 @@ //if(curOrgId.length()>13){ // curOrgId=curOrgId.substring(0,13); //} - curOrgId=curOrgId.substring(0,curOrgId.length()-4); + curOrgId=curOrgId.substring(0,curOrgId.length()-3); pid=curOrgId; String selectType=CurPage.getParameter("selectType"); String flowno=CurPage.getParameter("flowno"); 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/Core/OfficeTemplate/TemplateManager/BFTemplate/BFTemplateList.jsp b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplate/BFTemplateList.jsp index 7aec475fb..244a758de 100644 --- a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplate/BFTemplateList.jsp +++ b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplate/BFTemplateList.jsp @@ -201,6 +201,7 @@ function testTemplateLable(){ window.frames["AttachmentList"].viewFile(); } function importConfigure(){ + alert(11); var sPara = getItemValue(0,getRow(0),'id'); if(typeof(sPara)=="undefined" || sPara.length==0 ){ alert("参数不能为空!"); diff --git a/WebContent/Tenwa/Customer/TelephoneVerify/TelephoneVerifyList.jsp b/WebContent/Tenwa/Customer/TelephoneVerify/TelephoneVerifyList.jsp index 89222bbef..1acc30d67 100644 --- a/WebContent/Tenwa/Customer/TelephoneVerify/TelephoneVerifyList.jsp +++ b/WebContent/Tenwa/Customer/TelephoneVerify/TelephoneVerifyList.jsp @@ -88,7 +88,7 @@ getObj(0,i,"filelist").innerHTML=html; getObj(0,i,"filelist").style["white-space"]="pre-wrap"; var height = getObj(0,i,"filelist").offsetHeight+1; - setItemStyle(0,i,"CUST_NAME","height="+height+"px"); + setItemStyle(0,i,"FULLNAME","height="+height+"px"); }; } function upload(id){ diff --git a/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceInfoDetail.jsp b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceInfoDetail.jsp index 0b9baa57d..be7e611b6 100644 --- a/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceInfoDetail.jsp +++ b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsuranceInfoDetail.jsp @@ -5,22 +5,24 @@ Content: 示例详情页面 History Log: */ - String sPrevUrl = CurPage.getParameter("PrevUrl"); + String contract_number = CurPage.getParameter("contract_number"); + String sPrevUrl = CurPage.getParameter("ID"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LBInsuranceInfoDetail";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, - {"true","","Button","返回","返回列表页面","goBack()","","","","btn_icon_return"} + {"true","All","Button","返回","返回列表页面","goBack()","","","","btn_icon_return"} }; %><%@ 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/App/BussinessOperation/InsuranceInfo/InsureAttachmentUpload.jsp b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsureAttachmentUpload.jsp new file mode 100644 index 000000000..9241b0ffc --- /dev/null +++ b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/InsureAttachmentUpload.jsp @@ -0,0 +1,103 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-05-31 + Content: 示例详情页面 + History Log: + */ + String Library_id = CurPage.getParameter("Library_id"); + + //定义变量 + String sObjectNo = "";//--对象编号 + //获得组件参数 + String flowNo=CurPage.getParameter("FlowNo"); + + String sPrevUrl = CurPage.getParameter("PrevUrl"); + //if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyList.jsp"; + + String sTempletNo = "InsureAttachmentUpload";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(Library_id); + String sButtons[][] = { + {"true","","Button","保存","保存所有修改","importRecord()","","","",""}, + {"true","All","Button","取消","返回列表","pull()","","","","btn_icon_close"} + }; + /* 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/App/BussinessOperation/InsuranceInfo/LBInsuranceInfoList.jsp b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/LBInsuranceInfoList.jsp new file mode 100644 index 000000000..a8884f948 --- /dev/null +++ b/WebContent/Tenwa/Lease/App/BussinessOperation/InsuranceInfo/LBInsuranceInfoList.jsp @@ -0,0 +1,129 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-06-03 + Content: + History Log: + */ + String contract_number = CurPage.getParameter("contract_number"); + ASObjectModel doTemp = new ASObjectModel("LBInsuranceInfoTwoList"); + if (""!=contract_number || null==contract_number){ + doTemp.appendJboWhere("lci.CONTRACT_NUMBER='"+contract_number+"'"); + } + + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + {"true","","Button","返回","返回","returnList()","","","","btn_icon_return",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file 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/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index 7c45d1cb5..c3b7722c4 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -39,7 +39,7 @@ sProjId=bocl.getAttribute("proj_id").getString(); sProductId=bocl.getAttribute("productId").getString(); } - if (sProductId.equals("0005")){ + /* if (sProductId.equals("0005")){ LeaseType="DoubleLease"; }else if(sProductId.equals("0001")){ LeaseType="NormalLease"; @@ -47,7 +47,7 @@ LeaseType="CarBusiness"; }else{ LeaseType="NoBusiness"; - } + } */ doTemp.setHtmlEvent("ONECLASSIFY","onchange","initTwoClass"); doTemp.setHtmlEvent("TWOCLASSIFY","onchange","initThreeClass"); @@ -99,7 +99,7 @@ //加载一级分类选项 function initOneClass(status){ var oneClass=getItemValue(0,0,"ONECLASSIFY"); - var sql="SELECT itemno,itemname FROM code_library WHERE codeno='DocList' AND itemno LIKE '005%' AND LENGTH(itemno)=6 and attribute1='<%=LeaseType%>'"; + var sql="SELECT itemno,itemname FROM code_library WHERE codeno='DocList' AND itemno LIKE '005%' AND LENGTH(itemno)=6 "; initSelectOption(sql,"itemname","itemno","ONECLASSIFY"); if(status=="edit"){ setItemValue(0,0,"ONECLASSIFY",oneClass); @@ -198,11 +198,11 @@ alert("请勾选合同模板!"); return; } - +alert(tempids); var param={}; var tempParam={}; var sparam=""; - + // param["templateNo"]="0010"; tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>"; 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; + } + }