From 95421aa960e5be2cafe78d017d0dcc2242393949 Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 29 Jun 2018 14:14:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF=E5=80=BC=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Core/FlowManager/GetObjectInfo.jsp | 5 +++-- .../LDistributorAccountList.jsp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/WebContent/Tenwa/Core/FlowManager/GetObjectInfo.jsp b/WebContent/Tenwa/Core/FlowManager/GetObjectInfo.jsp index 8c2637a5e..93a40821b 100644 --- a/WebContent/Tenwa/Core/FlowManager/GetObjectInfo.jsp +++ b/WebContent/Tenwa/Core/FlowManager/GetObjectInfo.jsp @@ -11,11 +11,12 @@ if(staskNo==null){staskNo="";} BizObject bos = JBOFactory .getBizObjectManager("jbo.sys.FLOW_TASK") - .createQuery("SELECT O.phasename,O.flowname,fb.proj_name FROM O ,jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT fb WHERE O.objectno=fb.flow_unid AND O.SERIALNO=:taskNo ") + .createQuery("SELECT O.phasename,O.flowno,O.flowname,fb.proj_name FROM O ,jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT fb WHERE O.objectno=fb.flow_unid AND O.SERIALNO=:taskNo ") .setParameter("taskNo",staskNo).getSingleResult(false); String sObjectTitle = ""; - if("".equals(bos.getAttribute("proj_name").toString())){ + if("".equals(bos.getAttribute("proj_name").toString()) + ||"DistributorApprovalFlow".equals(bos.getAttribute("flowno").toString())){ sObjectTitle = bos.getAttribute("flowname").toString()+"【"+bos.getAttribute("phasename").toString()+"】"; }else{ sObjectTitle = bos.getAttribute("flowname").toString()+"【"+bos.getAttribute("phasename").toString()+"】-"+bos.getAttribute("proj_name").toString(); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp index 2dfae980c..2b8882024 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp @@ -1,4 +1,5 @@ <%@ page contentType="text/html; charset=GBK"%> +<%@page import="com.amarsoft.are.jbo.JBOTransaction"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% /* Author: undefined 2017-10-11 @@ -10,29 +11,28 @@ String ishistory=CurPage.getParameter("IsHistory"); String RightType=CurPage.getParameter("RightType"); - - - - - - + String disno=""; + List nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where flow_unid=:flowunid") + .setParameter("flowunid",sFlowUnid).getResultList(false); + if(nolist.size()>0){ + disno=nolist.get(0).getAttribute("distributor_no").getString(); + } if(sFlowUnid == null) sFlowUnid=""; String sTempletNo = CurPage.getParameter("TempletNo");//模板号 if(sTempletNo == null) sTempletNo = "LDistributorAccountList"; if("DealerDepositReturnApply".equals(sFlowName)){ sTempletNo = "LDistributorAccountListS"; } - ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- //dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(20); - dwTemp.genHTMLObjectWindow(sFlowUnid); + dwTemp.genHTMLObjectWindow(disno); String sButtons[][] =null; - if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + if("DealerDepositReturnApply".equals(sFlowName)||"DealerDepositChargeApply".equals(sFlowName)){ sButtons=new String[][] { //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},