From 118943ad93e12237466eedc57e1cce57073c576e Mon Sep 17 00:00:00 2001 From: liuz Date: Mon, 23 Jul 2018 14:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=9B=86=E5=9B=A2=E5=A4=96=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DealerDeposit/DMarginChargeInfo_TempList.jsp | 4 ++-- .../DistributorRegister/CLMSDistributorList.jsp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp index 976c5b11a..dcf49965a 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_TempList.jsp @@ -42,13 +42,13 @@ function view(){ var sUrl = "/DealerDeposit/DMarginChargeInfo_Temp.jsp"; var ID = getItemValue(0,getRow(0),'ID'); - var id = getItemValue(0,getRow(0),'id'); + //var id = getItemValue(0,getRow(0),'id'); var param = '<%=ProjectName%>'; if(typeof(ID)=="undefined" || ID.length==0 ){ alert("请选择一条信息！"); return ; } - AsControl.OpenView(sUrl,"ID="+ID+"&id="+id+'&rightType=ReadOnly&ProjectName='+param,"_self",""); + AsControl.OpenView(sUrl,'ID='+ID+'&rightType=ReadOnly&ProjectName='+param,"_self",""); } function viewAndEdit(){ diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp index 30590d44b..a94e55868 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp @@ -58,11 +58,6 @@ function teaming(){ return; } - if(confirm("确定激活?")){ - var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","setDistributorStatus","id="+id+",distributor_status="+distributor_status); - alert("更改状态成功"); - reloadSelf(); - } var id = getItemValue(0,getRow(0),'ID'); //debugger; @@ -73,6 +68,11 @@ function teaming(){ alert("集团外的经销商需收取保证金后再进行激活！"); return; } + if(confirm("确定激活?")){ + var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","setDistributorStatus","id="+id+",distributor_status="+distributor_status); + alert("更改状态成功"); + reloadSelf(); + } } function teamingSuspend(){