diff --git a/WebContent/Tenwa/Customer/Group/GroupCompany/DistributorGroupChannelList.jsp b/WebContent/Tenwa/Customer/Group/GroupCompany/DistributorGroupChannelList.jsp
new file mode 100644
index 000000000..dcc176c5a
--- /dev/null
+++ b/WebContent/Tenwa/Customer/Group/GroupCompany/DistributorGroupChannelList.jsp
@@ -0,0 +1,77 @@
+<%@page import="com.tenwa.comm.dataRightmanager.DataRightManager"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	String typeno= CurPage.getParameter("TYPENO");
+	ASObjectModel doTemp = new ASObjectModel("DistributorGroupChannelList");
+	String otherWhere=DataRightManager.getRightCondition(CurUser,"O");
+	//doTemp.appendJboWhere(otherWhere);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(typeno);
+	String sButtons[][] = {
+			{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+			{"true","All","Button","修改","修改","edit()","","","","btn_icon_edit",""},
+			{"true","","Button","详情","详情","view()","","","","btn_icon_detail",""},
+			{"true","All","Button","废弃","废弃","del()","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	//新增
+	function newRecord(){
+		var sUrl = "/Tenwa/Customer/Group/GroupCompany/Distributorsubordinatedistribution.jsp";
+		AsDialog.PopView(sUrl,"typeno=<%=typeno%>","resizable=yes;dialogWidth=500px;dialogHeight=200px;center:yes;status:no;statusbar:no",function(sReturnValue){
+			if(typeof(sReturnValue)!=undefined && sReturnValue!=''){
+				var result = sReturnValue.split('&');
+				var group_no = result[0];
+				var sId=RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","getNewId","group_no="+group_no);
+				var group_name = result[1];
+				AsControl.OpenView("/Tenwa/Customer/Group/GroupCompany/DistributorCustomerGroupCompany.jsp","id="+sId+"&group_no="+group_no+'&group_name='+group_name,"_self","");
+	   		}	   
+		},"新增");
+	}
+	//详情
+	function view(){
+		 var sUrl = "/Tenwa/Customer/Group/GroupCompany/DistributorCustomerGroupCompany.jsp";
+		 var group_no = getItemValue(0,getRow(0),'group_no');
+		 var id = getItemValue(0,getRow(0),'id');
+		 if(typeof(group_no)=="undefined" || group_no.length==0 ){
+			 alert("请选择一条信息！");
+			return ;
+		 }
+		 AsControl.OpenView(sUrl,"group_no="+group_no+"&id="+id+'&rightType=ReadOnly',"_self","");
+	}
+	//修改
+	function edit(){
+		 var sUrl = "/Tenwa/Customer/Group/GroupCompany/DistributorCustomerGroupCompany.jsp";
+		 var group_no = getItemValue(0,getRow(0),'group_no');
+		 var id = getItemValue(0,getRow(0),'id');
+		 if(typeof(group_no)=="undefined" || group_no.length==0 ){
+			alert("请选择一条信息！");
+			return ;
+		 }
+		 AsControl.OpenView(sUrl,"group_no="+group_no+"&id="+id,"_self","");
+	}
+	//废弃
+	function del(){
+		if(confirm("是否确认废弃该客户？")){
+			var id = getItemValue(0,getRow(),"id");
+			if(typeof(id)=="undefined" || id.length==0 ){
+				alert("请选择一条信息！");
+				return ;
+			}
+			var status = getItemValue(0,getRow(),"status");
+			if(status == "status03"){
+				alert("操作失败，该客户状态已是废弃状态");
+				return;
+			}
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","dis_del","id="+id);
+			if(sReturnInfo == "true"){
+				alert("操作成功");
+				reloadSelf();
+			}
+		}
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Customer/Group/GroupCompany/Distributorsubordinatedistribution.jsp b/WebContent/Tenwa/Customer/Group/GroupCompany/Distributorsubordinatedistribution.jsp
new file mode 100644
index 000000000..4cf318b41
--- /dev/null
+++ b/WebContent/Tenwa/Customer/Group/GroupCompany/Distributorsubordinatedistribution.jsp
@@ -0,0 +1,58 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	String sTempletNo = "Distributorsubordinate";//--模板号--
+	String typeno=CurPage.getParameter("typeno");
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setHtmlEvent("group_no","onChange","checkGroupNo");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(typeno);
+	
+	String sButtons[][] = {
+		{"true","All","Button","确定","注册集团信息","saveRecord()","","","","btn_icon_submit"},
+		{"true","All","Button","取消","取消","goBack()","","","","btn_icon_close"},
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	//保存
+	function saveRecord(){
+		if(!checkGroupNo()) return;
+		if(!iV_all("0")) return;//先检查填写完整性
+		var group_no = getItemValue(0,getRow(0),'group_no');
+		setItemValue(0, 0, "productid", "<%=typeno%>");
+		var group_name = getItemValue(0,getRow(0),'group_name');
+		var id=getItemValue(0,getRow(0),'id');
+		for(var i = 0;i < group_name.length;i++){
+			if(group_name.charAt(i) == "'" || group_name.charAt(i) == "<" || group_name.charAt(i) == ">"){
+				alert("集团名称含有非法字符");
+				return;
+			}
+		}
+		var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","distributor_group_name","group_name="+group_name);
+		if(sReturnInfo != "false"){
+			if(sReturnInfo == 'status01')alert("该集团名称已存在(潜在)");
+			if(sReturnInfo == 'status02')alert("该集团名称已存在(正式)");
+			if(sReturnInfo == 'status03')alert("该集团名称已存在(废弃)");
+			if(sReturnInfo == 'status04')alert("该集团名称已存在(草稿)");
+			return;
+		}
+		var param = group_no+"&"+group_name;
+		as_save("myiframe0","parent.AsDialog.ClosePage('"+param+"')");
+	}
+	function goBack(){ 
+		parent.AsDialog.ClosePage();
+	}
+	
+	//校验编号是否存在
+	function checkGroupNo(){
+		var group_no = getItemValue(0,0,'group_no');
+		var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","distributor_group_no","group_no="+group_no);
+		if("false" ==sReturnInfo){
+			alert("该编号已存在，请重新输入！！！");
+			return false;
+		}
+		return true;
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file