diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
index 11e62196a..fa61d3fbb 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
@@ -10,12 +10,15 @@
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.MultiSelect = true; //多选
dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.ShowSummary = "1"; //显示小计
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
{"true","All","Button","生成租金凭证","生成租金凭证","Manage()","","","","",""},
+ {"true","All","Button","修改记账日期","修改记账日期","viewAndEdit()","","","","",""},
+
};
%><%@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/CollectionAudit/VI_SNAP_JOINT_VOUCHERInfo.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHERInfo.jsp
new file mode 100644
index 000000000..644e1c6f4
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHERInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%>
+ <%
+ /*
+ Author:guosl 2017-05-05
+ Tester:
+ Content: 项目基本信息-租赁物件列表页面
+ Input Param:
+ Output param:
+ History Log:
+ */
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+ <%
+ String PG_TITLE = "记账日期"; // 浏览器窗口标题
PG_TITLE
+ %>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量,获取参数;]~*/%>
+<%
+ String income_IDs= CurPage.getParameter("income_IDs");//ID
+ String sTempletNo="VOUCHERINFO";
+
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%>
+<%
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+%>
+
+<%
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ {"true","All","Button","确定","保存所有修改","saveRecord()","","","","btn_icon_save"},
+ {"true","","Button","返回","返回列表页面","goBack()","","","","btn_icon_return"}
+ };
+ sButtonPosition = "north";
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+ <%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时,进行初始化;]~*/%>
+
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx b/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx
index 369fa3486..982f7ee15 100644
Binary files a/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx and b/WebContent/fileTemplate/鏀炬閫氱煡涔﹀強鏀炬鍒拌处纭涔.docx differ
diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/VOUCHERINFO.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/VOUCHERINFO.java
new file mode 100644
index 000000000..507d4798b
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/VOUCHERINFO.java
@@ -0,0 +1,90 @@
+package com.tenwa.lease.flow.contract.commbusiness;
+
+import java.util.List;
+
+import jbo.app.tenwa.calc.LC_RENT_INCOME;
+
+
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+
+public class VOUCHERINFO {
+
+
+
+
+ private String income_IDs;
+ public String ACCOUNTING_DATE;
+
+
+
+
+ public String getIncome_IDs() {
+ return income_IDs;
+ }
+
+
+
+
+ public void setIncome_IDs(String income_IDs) {
+ this.income_IDs = income_IDs;
+ }
+
+
+
+
+
+
+
+ public String getACCOUNTING_DATE() {
+ return ACCOUNTING_DATE;
+ }
+
+
+
+
+ public void setACCOUNTING_DATE(String aCCOUNTING_DATE) {
+ ACCOUNTING_DATE = aCCOUNTING_DATE;
+ }
+
+
+
+
+ public String XiuGai(JBOTransaction tx)throws Exception{
+ BizObjectManager bo=JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME);
+ tx.join(bo);
+ String[] lists=this.getIncome_IDs().toString().split("@");
+ for(String income_ID : lists){
+ BizObjectQuery bq=bo.createQuery("update O set ACCOUNTING_DATE=:ACCOUNTING_DATE where id='"+income_ID+"'").setParameter("ACCOUNTING_DATE",ACCOUNTING_DATE);
+ bq.executeUpdate();
+ }
+
+
+ return "success";
+ }
+ public String JiaoYan(JBOTransaction tx)throws Exception{
+ BizObjectManager bo=JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME);
+ tx.join(bo);
+ String ma="";
+ String[] lists=this.getIncome_IDs().toString().split("@");
+ for(String income_ID : lists){
+ BizObject boo = bo.createQuery("id=:id").setParameter("id", income_ID).getSingleResult(false);
+ String HIRE_DATE = boo.getAttribute("HIRE_DATE").toString();
+ HIRE_DATE = HIRE_DATE.replaceAll("/", "");
+ ACCOUNTING_DATE =ACCOUNTING_DATE.replaceAll("/", "");
+ Integer hireDate = Integer.parseInt(HIRE_DATE);
+ Integer accountingDate = Integer.parseInt(ACCOUNTING_DATE);
+ if(hireDate>accountingDate){
+ ma="false";
+ break;
+ }
+ }
+ return ma;
+ }
+
+
+}