diff --git a/WebContent/Tenwa/Comm/DocList/PayDocListProject.jsp b/WebContent/Tenwa/Comm/DocList/PayDocListProject.jsp index 82069977c..db5cd04b1 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocListProject.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocListProject.jsp @@ -99,11 +99,11 @@ window.onload=function(){ var RowCount = getRowCount(0); - for(var i=0;i,FlowUnid=<%=sFlowUnid%>,flagType=settletradition"); - + if("success"==result){ + alert("盖章成功!"); + }else{ + alert("盖章失败!"); + } location.reload(); } diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp index b0ee67196..d15e35ac8 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp @@ -34,7 +34,7 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 String sButtons[][] =null; sButtons=new String[][]{ - {"true","All","Button","生成租金通知书","生成租金通知书","generateQuotation()","","","","btn_icon_generate"}, + {"true","All","Button","生成提前终止模板","生成提前终止模板","generateQuotation()","","","","btn_icon_generate"}, {"true","All","Button","公司盖章","公司盖章","stamp()","","","",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> @@ -143,6 +143,12 @@ function stamp(){ var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=TriditionSuspension"); + if("success"==result){ + alert("盖章成功!"); + }else{ + alert("盖章失败!"); + } + reloadSelf(); } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx b/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx index 09eef941c..abc8cd52c 100644 Binary files a/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx and b/WebContent/fileTemplate/绉熻祦鎻愬墠缁堟閫氱煡涔.docx differ diff --git a/WebContent/fileTemplate/缁撴竻璇佹槑.docx b/WebContent/fileTemplate/缁撴竻璇佹槑.docx index 56a68b267..5f65a8920 100644 Binary files a/WebContent/fileTemplate/缁撴竻璇佹槑.docx and b/WebContent/fileTemplate/缁撴竻璇佹槑.docx differ diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index 8865f3a12..e52ebd560 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -2459,7 +2459,9 @@ public String claimSign(JBOTransaction tx) throws Exception { DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); }else if("TriditionSuspension".equals(flagType)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='TriditionSuspension' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); - }else { + }else if("settletradition".equals(flagType)){ + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='settletradition' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); + }else{ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%打印催款函%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); } if (DOCRELATIVE != null) {