diff --git a/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp b/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp index dd97ed245..5b95bf5ea 100644 --- a/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/AdjustInterest/LCAdjustContractTemp.jsp @@ -109,7 +109,6 @@ } //公司盖章 function stamp(){ - debugger; var flie = getItemValue(0,getRow(0),"FILENAME"); if(typeof(flie)=="undefined"||flie==null||flie==""){ alert("请先生成租金通知书!"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp new file mode 100644 index 000000000..163063cbe --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -0,0 +1,71 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-07-16 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("rightsFileList"); + 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","生成产权证书","生成产权证书","saveRecord()","","","","btn_icon_save"}, + }; + sButtonPosition = "north"; +%><%@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/fileTemplate/浜ф潈杞Щ璇佷功.docx b/WebContent/fileTemplate/浜ф潈杞Щ璇佷功.docx new file mode 100644 index 000000000..0711dba7a Binary files /dev/null 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 9a95d509e..f9cdd9d58 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1603,8 +1603,8 @@ public void wordToPdfJar(JBOTransaction tx){ BizObject DOCRELATIVE = null; if("null".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); - }else if("transfer".equals(PLAN_LIST)){ - DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='产权转移单'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); + }else if("rights".equals(PLAN_LIST)){ + DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='rights'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("settle".equals(PLAN_LIST)){ DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='提前结清证明'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false); }else if("TX".equals(PLAN_LIST)){