diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp index b60df3817..821bced6a 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalApply/AssetsDisposalApplyList.jsp @@ -35,7 +35,7 @@ alert(mes); } reloadSelf(); - },"请选择投放"); + },"请选择合同"); } <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp index b067768d8..ce674882e 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalMaintenance/AssetsDisposalMaintenanceList.jsp @@ -3,10 +3,10 @@ <%@ include file="/Frame/resources/include/include_begin_list.jspf"%> <% ASObjectModel doTemp = new ASObjectModel("LBAssetsDisposalMaintenanceList"); - String sCondtion=DataRightManager.getRightCondition(CurUser,"lci", "contract"); - doTemp.appendJboWhere(sCondtion); - doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseover", "showMemo"); - doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseout", "hideMemo"); + //String sCondtion=DataRightManager.getRightCondition(CurUser,"lci", "contract"); + //doTemp.appendJboWhere(sCondtion); + //doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseover", "showMemo"); + //doTemp.setHtmlEvent("CONDITION_DEMO", "onmouseout", "hideMemo"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp index b3437e956..a99778ef3 100644 --- a/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp +++ b/WebContent/Tenwa/Lease/Flow/CarManage/CarDispose/LcCarDisposeDetail.jsp @@ -10,7 +10,7 @@ String ishistory=CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); String framenumber = Sqlca.getString("select FRAME_NUMBER from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); - String contractnumber = Sqlca.getString("select contract_no from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); + //String contractnumber = Sqlca.getString("select contract_no from LC_CAR_DISPOSE_TEMP where flowunid ='"+flowunid+"'"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LcCarDisposeDetail";//--模板号-- diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index c91331278..9558e77df 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3083,6 +3083,8 @@ + + @@ -3134,6 +3136,8 @@ + + diff --git a/src_tenwa/com/tenwa/lease/flow/carmanage/cardispose/LCCarDisposeInitToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/carmanage/cardispose/LCCarDisposeInitToTempBusiness.java index d25cfcadb..709a6a9d5 100644 --- a/src_tenwa/com/tenwa/lease/flow/carmanage/cardispose/LCCarDisposeInitToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/carmanage/cardispose/LCCarDisposeInitToTempBusiness.java @@ -33,6 +33,7 @@ public class LCCarDisposeInitToTempBusiness extends BaseBussiness { bo.setAttributeValue("remain_principal", sum); bo.setAttributeValue("flowunid", this.getAttribute("FlowUnid").toString()); bo.setAttributeValue("FRAME_NUMBER", this.getAttribute("ProjectName").toString().split("-")[0]); + bo.setAttributeValue("contract_no", this.getAttribute("FlowKey").toString()); bm.saveObject(bo); String sMessage="true";