diff --git a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp index a460dca40..d4aef86fa 100644 --- a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp +++ b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp @@ -9,6 +9,7 @@ */ String PG_TITLE = "产品目录详情"; String productId = CurPage.getAttribute("ProductId"); + String typeName = CurPage.getAttribute("typeName"); BusinessObject inputParameter=SystemHelper.getPageComponentParameters(CurPage); ASObjectWindow dwTemp =ObjectWindowHelper.createObjectWindow_Info("PRD_ProductCatalogInfoWithCopy", inputParameter, CurPage, request); ASDataObject doTemp=dwTemp.getDataObject(); @@ -50,6 +51,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%> } $().ready(function(){ + setItemValue(0,0,"CatalogName","<%=typeName%>"); }); <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp index 42923209a..f2e399ec6 100644 --- a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp @@ -2,6 +2,7 @@ include file="/Frame/resources/include/include_begin_list.jspf"%> <% String sortNo = CurPage.getParameter("SortNo"); + String typeName = CurPage.getParameter("typeName"); String userId = CurPage.getUserId(); if(sortNo == null) sortNo = ""; ASObjectModel doTemp = new ASObjectModel("PRD_ProductCatalogList"); @@ -66,7 +67,7 @@ //路径 var sUrl = "/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp"; //传参 - var sParam = "ProductId="+getItemValue(0,getRow(),"TypeNo"); + var sParam = "ProductId="+getItemValue(0,getRow(),"TypeNo")+"&typeName=<%=typeName%>"; AsDialog.PopView(sUrl,sParam,"dialogWidth=320px;dialogHeight=200px;status:no;center:yes;help:no;minimize:no;maximize:no;border:thin;statusbar:no",function(){ reloadSelf(); parent.reloadSelf(); diff --git a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp index 9daff4d8f..b9afc8a13 100644 --- a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp @@ -26,7 +26,7 @@ List catalogList = bomanager.loadBusinessObjects("jbo.prd.BUSINESS_TYPE", "Attribute10='Catalog' and isInUse='1' "+condition); for(BusinessObject catalog : catalogList){ - String p = tviTemp.insertPage("root",catalog.getString("TypeName"),catalog.getString("TypeNo"),"OpenComp(\"ProductFrame\",\"/ProductManage/ProductConfig/ProductCatalogList.jsp\",\"SortNo="+catalog.getString("SortNo")+"\",\"frameright\");",i++); + String p = tviTemp.insertPage("root",catalog.getString("TypeName"),catalog.getString("TypeNo"),"OpenComp(\"ProductFrame\",\"/ProductManage/ProductConfig/ProductCatalogList.jsp\",\"SortNo="+catalog.getString("SortNo")+"&typeName="+catalog.getString("TYPENAME")+"\",\"frameright\");",i++); List libraryList = bomanager.loadBusinessObjects("jbo.prd.BUSINESS_TYPE", "SortNo like :SortNo and isInUse='1' and (Attribute10 is null or Attribute10 = '')", "SortNo", catalog.getString("SortNo")+"%"); for(BusinessObject library : libraryList){ tviTemp.insertPage(p, library.getString("TypeName"),library.getString("TypeNo"),"OpenComp(\"ProductFrame2\",\"/ProductManage/ProductConfig/ProductInfo.jsp\",\"TypeNo="+library.getString("TypeNo")+"&RightType=ReadOnly\",\"frameright\");",i++);