From 3e77a9141a86041e3cfa62c982ea9c08723c1444 Mon Sep 17 00:00:00 2001
From: tenwaPC <tenwaPC@192.168.1.106>
Date: Mon, 3 Sep 2018 09:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=80=89=E6=8B=A9=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ComponentConfig/ComponentLibraryInfo.jsp  |  8 ++++----
 .../ComponentConfig/ComponentLibraryList.jsp  |  3 ++-
 .../ProductConfig/ProductComponentDef.jsp     |  3 ++-
 .../ProductConfig/ProductSpecificInfo.jsp     | 20 ++++++++++++++++---
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/WebContent/ProductManage/ComponentConfig/ComponentLibraryInfo.jsp b/WebContent/ProductManage/ComponentConfig/ComponentLibraryInfo.jsp
index 35afdf069..726101a40 100644
--- a/WebContent/ProductManage/ComponentConfig/ComponentLibraryInfo.jsp
+++ b/WebContent/ProductManage/ComponentConfig/ComponentLibraryInfo.jsp
@@ -22,10 +22,10 @@
 
 %><%@include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">	
-	function changeFormat(){
-// 		format();
-		//as_save(0,"openRule();");
-	}
+// 	function changeFormat(){
+// // 		format();
+// 		//as_save(0,"openRule();");
+// 	}
 	
 	function format()
 	{
diff --git a/WebContent/ProductManage/ComponentConfig/ComponentLibraryList.jsp b/WebContent/ProductManage/ComponentConfig/ComponentLibraryList.jsp
index 4d26bec73..4fbd3b9c3 100644
--- a/WebContent/ProductManage/ComponentConfig/ComponentLibraryList.jsp
+++ b/WebContent/ProductManage/ComponentConfig/ComponentLibraryList.jsp
@@ -13,13 +13,14 @@
 	ASDataObject doTemp=dwTemp.getDataObject();
 	doTemp.setBusinessProcess("com.amarsoft.app.als.businessobject.web.XMLBusinessObjectProcessor");
 	dwTemp.Style="1";      	     //设置为Grid风格
-	dwTemp.ReadOnly="1";
+	dwTemp.ReadOnly="0";
 	dwTemp.setPageSize(20);
 	dwTemp.genHTMLObjectWindow("");
 	
 	String sButtons[][] = {
 			{(StringX.isEmpty(componentRightType) ? "true" : "false" ),"All","Button","新增","新增","newComponent()","","","","",""},
 			{"true","","Button","编辑","编辑","editComponent()","","","","",""},
+			{(xmlTags.indexOf("ChildrenComponent") > 0 ? "false" : "true"),"","Button","保存","保存","as_save(0)","","","","",""},
 			{(xmlTags.indexOf("ChildrenComponent") > 0 ? "false" : "true"),"","Button","复制","复制","copyComponent()","","","","",""},
 			{(StringX.isEmpty(componentRightType) ? "true" : "false" ),"All","Button","删除","删除","deleteComponent()","","","","",""},
 			{(xmlTags.indexOf("ChildrenComponent") > 0 ? "false" : "true"),"","Button","组件同步","组件同步","synchronize()","","","","",""},
diff --git a/WebContent/ProductManage/ProductConfig/ProductComponentDef.jsp b/WebContent/ProductManage/ProductConfig/ProductComponentDef.jsp
index b7ea56b80..0d4550368 100644
--- a/WebContent/ProductManage/ProductConfig/ProductComponentDef.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductComponentDef.jsp
@@ -16,6 +16,7 @@
 <%
 	String specificSerialNo = CurPage.getParameter("SpecificSerialNo");
 	String productID = CurPage.getParameter("ProductID");
+	String productType2 = CurPage.getParameter("ProductType2");
 	//产品组件类型文件
 	String xmlFile = "{$ARE.PRD_HOME}/etc/app/component/componenttype-config.xml";
 	xmlFile = ARE.replaceARETags(xmlFile);
@@ -28,7 +29,7 @@
 	String xmlComponentFile = "{$ARE.PRD_HOME}/etc/app/component/component-config.xml";
 	xmlComponentFile = ARE.replaceARETags(xmlComponentFile);
 	//产品组件筛选条件
-	String xmlComponentTags = "Component||Status='1'";
+	String xmlComponentTags = "Component||Status='1' and PRODUCT_TYPE like '" + productType2 + "'";
 	//产品组件关键字
 	String componentKeys = "ID";
 	
diff --git a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
index 5cf18c871..646f58174 100644
--- a/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
@@ -40,18 +40,32 @@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 			AsControl.OpenView("/Tenwa/Core/CreditLimit/LALimitConfigList.jsp","SpecificId="+serialNo+"&ProductId=<%=productID%>&RightType=<%=CurPage.getParameter("RightType")%>","sys_sub_page_frame_GGCS","");
 		}
 	} --%>
+// 	function openComponentDef(){
+// 		var serialNo = getItemValue(0,getRow(),"SerialNo");
+// 		var versionID = getItemValue(0,getRow(),"VERSIONID");
+// 		if(typeof(serialNo) != "undefined" && serialNo != "")
+// 		{	
+<%-- 			AsControl.OpenView("/ProductManage/ProductConfig/ProductComponentDef.jsp","SpecificSerialNo="+serialNo+"&ProductID=<%=productID%>","sys_sub_page_frame_GGCS",""); --%>
+<%-- 		}else if(typeof(serialNo) != "undefined" && serialNo != "" && typeof(versionID) != "undefined" && versionID != "" && '<%=productType2%>'=='2' ) --%>
+// 		{
+<%-- 			AsControl.OpenView("/Tenwa/Core/CreditLimit/LALimitConfigList.jsp","SpecificId="+serialNo+"&ProductId=<%=productID%>&RightType=<%=CurPage.getParameter("RightType")%>","sys_sub_page_frame_GGCS",""); --%>
+// 		}
+// 	}
+
 	function openComponentDef(){
 		var serialNo = getItemValue(0,getRow(),"SerialNo");
 		var versionID = getItemValue(0,getRow(),"VERSIONID");
-		if(typeof(serialNo) != "undefined" && serialNo != "")
+		if(typeof(serialNo) != "undefined" && serialNo != "" && typeof(versionID) != "undefined" && versionID != "") {	
+			AsControl.OpenView("/ProductManage/ProductConfig/ProductComponentDef.jsp","CompClientID=<%=sCompClientID%>&SpecificSerialNo="+serialNo+"&ProductID=<%=productID%>&ProductType2=<%=productType2%>","sys_sub_page_frame_GGCS","");
+		}
+		<%-- if(typeof(serialNo) != "undefined" && serialNo != "" && typeof(versionID) != "undefined" && versionID != "" && '<%=productType2%>'=='1' )
 		{	
 			AsControl.OpenView("/ProductManage/ProductConfig/ProductComponentDef.jsp","SpecificSerialNo="+serialNo+"&ProductID=<%=productID%>","sys_sub_page_frame_GGCS","");
 		}else if(typeof(serialNo) != "undefined" && serialNo != "" && typeof(versionID) != "undefined" && versionID != "" && '<%=productType2%>'=='2' )
 		{
 			AsControl.OpenView("/Tenwa/Core/CreditLimit/LALimitConfigList.jsp","SpecificId="+serialNo+"&ProductId=<%=productID%>&RightType=<%=CurPage.getParameter("RightType")%>","sys_sub_page_frame_GGCS","");
-		}
+		} --%>
 	}
-	
 	$().ready(function(){
 		openComponentDef();
 	});