From d5e48cf45109f1ef8ac787c7628ac80ac0c45721 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Mon, 24 Jun 2019 20:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=82=AC=E6=94=B6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9jbo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rentcollection/CapgeminiReport.jsp | 3 +- .../rentcollection/ClearingDataReport.jsp | 3 +- .../rentcollection/DealerCollection.jsp | 102 ++++++++++++++++++ WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 42 ++++---- 4 files changed, 127 insertions(+), 23 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DealerCollection.jsp diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/CapgeminiReport.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/CapgeminiReport.jsp index 5f980e2d1..d09d26ddb 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/CapgeminiReport.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/CapgeminiReport.jsp @@ -36,7 +36,7 @@ if(roleList.contains("800R00000051")){ doTemp.appendJboWhere(" and O.distributor_no='"+distributor_no+"'"); - template = "cff950db664c4faeb1f4656629176004"; + template = "5addef5e8b56470688949d554cad4b24"; } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); @@ -71,6 +71,7 @@ //生成文件关联关系 tempParam["OBJECTTYPE"]="经销商租金计划报表"; tempParam["FLOW_UNID"]="<%=new java.util.Date().getTime()%>"; + tempParam["distributor_no"]="<%=distributor_no%>"; //生成模板固定参数 tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/ClearingDataReport.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/ClearingDataReport.jsp index d4a4b54c3..a81b101cc 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/ClearingDataReport.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/ClearingDataReport.jsp @@ -36,7 +36,7 @@ if(roleList.contains("800R00000051")){ doTemp.appendJboWhere(" and O.distributor_no='"+distributor_no+"'"); - template = "6d2b46cb97c84867b38e1f39d4e9a092"; + template = "6a3c4a11c86048928d8823f796ee9423"; } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); @@ -69,6 +69,7 @@ //生成文件关联关系 tempParam["OBJECTTYPE"]="经销商结清数据报表"; tempParam["FLOW_UNID"]="<%=new java.util.Date().getTime()%>"; + tempParam["distributor_no"]="<%=distributor_no%>"; //生成模板固定参数 tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DealerCollection.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DealerCollection.jsp new file mode 100644 index 000000000..28cd07a23 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/DealerCollection.jsp @@ -0,0 +1,102 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@ page import="org.apache.commons.lang.StringUtils" %> +<% + /* + Author: undefined 2018-10-30 + Content: + History Log: + */ + String userid=CurUser.getUserID(); + ASObjectModel doTemp = new ASObjectModel("dealer_collection"); + + //加权限 + BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE"); + List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid).getResultList(false); + List roleList = new ArrayList(); + String roleid = ""; + for(BizObject bo : roleListObject){ + roleid = bo.getAttribute("roleid").toString(); + roleList.add(roleid); + } + + //导出模板编号 + String template = ""; + + //登录人属于经销商角色 401：经销商roleid + if(roleList.contains("401") && !roleList.contains("800R00000051")){ + doTemp.appendJboWhere(" and lci.project_manage='"+userid+"'"); + //导出有权限 + template = "05d55e01017a4d80945d5b6c8a8c5faf"; + }else{ + template = "05d55e01017a4d80945d5b6c8a8c5faf"; + } + String belongorg = Sqlca.getString("select belongorg from user_info where userid='"+userid+"'"); + String distributor_no = Sqlca.getString("select distributor_no from distributor_info where orgid='"+belongorg+"'"); + + if(roleList.contains("800R00000051")){ + doTemp.appendJboWhere(" and O.distributor_no='"+distributor_no+"'"); + template = "c5af519f27ec4b62bacde30b0014f101"; + } + + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + 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","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","导出excel","导出excel","exportExcel()","","","","btn_icon_up",""}, + //{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@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/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 4e35dbda9..03442445f 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -3183,41 +3183,41 @@ - - - + + - - - - - - + + - - - - - - - - + + + + + + + + + + - - + + + + + @@ -3235,8 +3235,8 @@ - + @@ -3265,7 +3265,6 @@ - @@ -3273,6 +3272,7 @@ +