diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index 3c3e4eb25..f17248cda 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -128,7 +128,7 @@ $('#A_Group_0010').css('display','none'); $('#A_Group_0020').css('display','none'); } - var sReturn = RunJavaMethodSqlca("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","getContractClass","leasform="+"<%=leasform%>"); + var sReturn = RunJavaMethodSqlca("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","getContractClass","leasform="+"<%=leasform%>"+",isNetCar="+"<%=CurPage.getParameter("isNetCar")%>"); var jsonData=eval("("+sReturn+")"); initFileTemplate(eval("("+jsonData[0].fileTemplate+")")); // initOneClass(); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index 07e267a7f..2149d2c5e 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -34,6 +34,13 @@ return; } sReturn = sReturn.split("@"); + /* if(flowno=="BContractApproveApply"){ + var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid="+sReturn[0]); + if("error"==sReturnInfo){ + alert("请先完成签约验证!!!"); + return; + } + } */ var id=sReturn[0]; var product_id=sReturn[1]; var project_id = sReturn[2]; @@ -41,8 +48,9 @@ var customertype = sReturn[4]; var leasform = sReturn[5]; var carAttributes = sReturn[6]; + var isNetCar = sReturn[7]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",carAttributes="+carAttributes+",leasform="+leasform+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.contractapproval.ContractApprovalStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; diff --git a/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚.docx b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚.docx new file mode 100644 index 000000000..cffb19eca Binary files /dev/null and b/WebContent/fileTemplate/鍚堝悓锛堝敭鍚庡洖绉燂級鍜屾姷鎶煎悎鍚.docx differ diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index fca4f9180..e57e38b65 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -37,6 +37,7 @@ public class FileTemplateUtil { public String flowunid;//用于查询已经生成的合同 public String leasform;//用判断租赁方式 public String contractId; + public String isNetCar;//用于判断是否是网约车 public String getTemplateCalss() {return templateCalss;} public void setTemplateCalss(String templateCalss) {this.templateCalss = templateCalss;} @@ -76,6 +77,12 @@ public class FileTemplateUtil { public void setContractId(String contractId) { this.contractId = contractId; } + public String getIsNetCar() { + return isNetCar; + } + public void setIsNetCar(String isNetCar) { + this.isNetCar = isNetCar; + } public String getTemplateClass(Transaction Sqlca) throws Exception{ String fileClass=templateCalss.replaceAll("@", ","); @@ -122,7 +129,11 @@ public class FileTemplateUtil { /*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'}," + "{'text':'回租个人授权协议书','value':'e980635a77124d5598be1717c062b877'}," + "{'text':'抵押合同','value':'ec90c114914d4725b57729107888511c'}]"+"\"}]";*/ - return "[{'fileTemplate':\""+"[{'text':'合同(售后回租)','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; + if("0".equals(isNetCar)){ + return "[{'fileTemplate':\""+"[{'text':'合同(售后回租)','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]"; + }else{ + return "[{'fileTemplate':\""+"[{'text':'合同(售后回租)和抵押合同','value':'c8d5b729a0954482877c26a1293b766b'}]"+"\"}]"; + } } }