diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp index c9723f6c3..a04cba6a6 100644 --- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp @@ -9,24 +9,26 @@ String plan_date = DateAssistant.getToday(); ASObjectModel doTemp = new ASObjectModel("ViLcReviewAuditRentPlanList"); - doTemp.setJboWhere(" O.AUDIT_STATE = 'Y'"); + doTemp.setJboWhere(" O.AUDIT_STATE = 'N'"); //默认预查询 - doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') "); + //只有计划日期未收款的都可以收款 +doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE <= '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') "); + doTemp.setJboWhereWhenNoFilter(" and O.COLLECT_STATUS in ('未收款','部分收款') "); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.MultiSelect = true; //多选 dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(10); dwTemp.ShowSummary = "1"; //显示小计 + dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格 String sButtons[][] = { {"true","All","Button","批量扣款","批量扣款","batchCollect()","","","","btn_icon_add",""}, //{"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""}, - //{"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""}, + {"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""}, {"true","All","Button","手动刷新","手动刷新","queryBatchCollect()","","","","btn_icon_add",""}, - {"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""}, + //{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>