diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp
index df37be409..d61da0c03 100644
--- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp
+++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/ChannelDistributorInfo.jsp
@@ -6,6 +6,7 @@
History Log:
*/
String id = CurPage.getParameter("id");
+ String ids = CurPage.getParameter("distracted_id");
if(id == null) id = "";
String opration = CurPage.getParameter("opration");
if(opration == null) opration = "";
@@ -14,7 +15,7 @@
String distributor_status = CurPage.getParameter("distributor_status");
if(distributor_status == null) distributor_status = "";
- String sTempletNo = "CustomerDistributorInfo";//--模板号--
+ String sTempletNo = "LDistributorInfoS";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
if("add".equals(opration)){
doTemp.setDefaultValue("id",id);
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
index 218d137b0..01ad70da4 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
@@ -20,9 +20,9 @@
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
- {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ /* {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, */
{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
- {"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+ /* {"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, */
//{"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp
index e46dad979..7bf6f3ee3 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp
@@ -25,7 +25,7 @@
dwTemp.genHTMLObjectWindow(sFlowUnid);
String sButtons[][] = {
- {"true","All","Button","保存","保存所有修改","save()","","","",""}
+ /* {"true","All","Button","保存","保存所有修改","save()","","","",""} */
/* {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
*/ };
sButtonPosition = "north";
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp
index e1229aa13..7080f2969 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp
@@ -9,7 +9,7 @@
if(sFlowUnid == null) sFlowUnid="";
String DISTRIBUTOR_NO=CurPage.getParameter("DISTRIBUTOR_NO");
- String sTempletNo = "LDistributorChangeInfoBefore";//--模板号--
+ String sTempletNo = "LDistributorInfoS";//--模板号--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
//doTemp.setColTips("", "测试");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp
index f4a4550c3..a916a45b0 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp
@@ -20,9 +20,9 @@
}
distributorInfo = "{"+distributorInfo.substring(1)+"}";
*/
- String sTempletNo = CurPage.getParameter("TempletNo");//模板号
- if(sTempletNo == null) sTempletNo = "LDistributorChangeInfo";
-
+ //String sTempletNo = CurPage.getParameter("TempletNo");//模板号
+ //if(sTempletNo == null) sTempletNo = "LDistributorInfo";
+ String sTempletNo ="LDistributorInfoAfterChange";
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();
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index 96176c8d8..745c5c90a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -1643,8 +1643,6 @@
-
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 4620e6d63..209c1b9c8 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -621,7 +621,7 @@
-
+
@@ -648,7 +648,7 @@
-
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 6b954ff44..9a116a398 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1144,7 +1144,6 @@
-