diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 5103d13dd..fe5dce426 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -37,6 +37,7 @@ <% String sTempletNo = "OwnAccount";//--ģ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setHtmlEvent("FbSdk", "onchange", "changeFbSdk"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform if(rightType.equals("ReadOnly")){ @@ -84,6 +85,14 @@ setItemValue(0,0,"acc_name", sReturn[1]); },"ѡ","company"); } + function changeFbSdk(){ + var FbSdk = getItemValue(0,0,"FbSdk",); + if(FbSdk=='Y'){ + showItem(0,"branch_code"); + }else if(FbSdk=='N'){ + hideItem(0,"branch_code"); + } + } <%/*~END~*/%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 4b1a136fb..3324c4d5c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -151,7 +151,7 @@ - + diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 096616812..1e8aaa123 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -345,8 +345,8 @@ public class ProductCondition { doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "0"); doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "0"); }else if("Y".equals(rule.get("ISADJUST_INTEREST"))){ - doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "1"); - doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "1"); + doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "0"); + doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "0"); //ϢЧڵ doTemp.setColumnAttribute("ADJUST_STYLE","coleditsource","jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='adjust_style' and itemno in ("+this.getSqlWhere(rule.get("adjust_style"))+") order by sortno"); //Ϣʽ