diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp index 3edb3ed11..fd464ceff 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp @@ -6,29 +6,24 @@ History Log: */ String sFlowUnid = CurPage.getParameter("FlowUnid"); - String sPrevUrl = CurPage.getParameter("ID"); - //String ProjectName = CurPage.getParameter("ProjectName"); -/* if(sPrevUrl == null) sPrevUrl = "/DealerDeposit/DMarginChargeInfo_TempList.jsp"; */ - BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false); -// String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); + String sPrevUrl = CurPage.getParameter("id"); String sTempletNo = "DMarginChargeInfo_Temp";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); -/* doTemp.setColTips("", "测试"); */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); - String sButtons[][] = { {"true","All","Button","保存","保存所有修改","save()","","","",""}, - {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + {"true","All","Button","返回","返回列表","returnList()","","","",""} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp index 5bcad9b5d..579bedaf6 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp @@ -110,7 +110,8 @@ function teamingStop(){ } function detail(){ var id = getItemValue(0,getRow(0),'ID'); - var distributor_id = getItemValue(0,getRow(0),'DISTRIBUTOR_no'); + var distributor_id = getItemValue(0,getRow(0),'DISTRIBUTOR_NO'); + if(typeof(id)=="undefined" || id.length==0 ){ alert("请选择一条数据！"); return ; diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp index d61da0c03..2d0599c7e 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp @@ -7,6 +7,7 @@ */ String id = CurPage.getParameter("id"); String ids = CurPage.getParameter("distracted_id"); + String disid = CurPage.getParameter("distributor_id"); if(id == null) id = ""; String opration = CurPage.getParameter("opration"); if(opration == null) opration = ""; @@ -31,7 +32,7 @@ || "distributor_status06".equals(distributor_status)){ dwTemp.ReadOnly = "1";//只读模式 } - dwTemp.genHTMLObjectWindow(id); + dwTemp.genHTMLObjectWindow(disid); String sButtons[][] = null; if("distributor_status02".equals(distributor_status) || "distributor_status03".equals(distributor_status) diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorMain.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorMain.jsp index ebd12282c..821816423 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorMain.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorMain.jsp @@ -36,7 +36,7 @@ var sparam="id=<%=id%>&opration=<%=opration%>&readonly=<%=readonly%>"; var sparam1="distributor_id="+"<%=distributor_id%>&opration=<%=opration%>&readonly=<%=readonly%>"; - menuObject["经销商基本信息"]={"url":"/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp","param":sparam}; + menuObject["经销商基本信息"]={"url":"/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp","param":sparam1}; menuObject["经销商账户信息"]={"url":"/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorAccountList.jsp","param":sparam1}; var sCurItemID = getCurTVItem().id; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToFormalCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToFormalCarBusiness.java index 1bfd309ca..1a27b9898 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToFormalCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToFormalCarBusiness.java @@ -30,12 +30,12 @@ public class LBProjectIntoTempToFormalCarBusiness extends BaseBussiness { String currentdate = DateAssistant.getToday();//插入审批结束时间流程 otherProperty.put("end_date", currentdate); String status = null; - String result = Sqlca.getString("select fo.phasechoice from flow_task ft,flow_opinion fo where ft.relativeobjectno=fo.serialno and fo.phasechoice = 'disagree' and ft.relativeobjectno IS NOT NULL and ft.objectno='"+this.getAttribute("FlowUnid").toString()+"'"); - if("disagree".equals(result)){ - status = "101"; - }else { + //String result = Sqlca.getString("select fo.phasechoice from flow_task ft,flow_opinion fo where ft.relativeobjectno=fo.serialno and fo.phasechoice = 'disagree' and ft.relativeobjectno IS NOT NULL and ft.objectno='"+this.getAttribute("FlowUnid").toString()+"'"); + //if("disagree".equals(result)){ + //status = "101"; + //}else { status = "13"; - } + //} otherProperty.put("project_status", status); service.copyOrLoadProjectInfo(Sqlca, fromCondtion, toCondtion,otherProperty, ServiceOperatorEnum.TempToFormal); String sMessage="true";