From c938fcd2723a7129fc40186f1e08e6e0dd706a57 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 16 Jul 2018 10:25:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BB=A5=E5=90=8E=E5=8F=AF=E5=9C=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActualPayment/ActualPaymentTempList.jsp | 3 ++- .../component/component-parameter-config.xml | 20 +++++++++---------- .../app/component/componenttype-config.xml | 2 +- .../processor/BusinessComponentRuleDW.java | 7 ++++++- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp index d758ed473..72f5b79db 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp @@ -49,6 +49,7 @@ ado.setHtmlEvent("MEMO", "onmouseover", "showMemo"); ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo"); ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo"); + dwTemp.genHTMLObjectWindow(flowunid); //添加本方银行默认值 @@ -84,7 +85,7 @@ }; }else{ sButtons = new String[][]{ - {"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""}, + {"true","","Button","确认信息","确认信息","as_save(0,'setColRequired()')","","","","btn_icon_save",""}, {"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""} }; } diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index 08fb1c5cb..c30964dae 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -119,8 +119,8 @@ - - + + @@ -143,7 +143,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -179,9 +179,9 @@ - - - + + + @@ -193,7 +193,7 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml index 460c0a202..e37846e5e 100644 --- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml +++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml @@ -12,7 +12,7 @@ - + diff --git a/src_prd/com/amarsoft/app/als/businesscomponent/config/processor/BusinessComponentRuleDW.java b/src_prd/com/amarsoft/app/als/businesscomponent/config/processor/BusinessComponentRuleDW.java index b9d03abe1..59c52a8ca 100644 --- a/src_prd/com/amarsoft/app/als/businesscomponent/config/processor/BusinessComponentRuleDW.java +++ b/src_prd/com/amarsoft/app/als/businesscomponent/config/processor/BusinessComponentRuleDW.java @@ -70,6 +70,11 @@ public class BusinessComponentRuleDW implements ObjectWindowCreator{ } if(htmlStyle==null) htmlStyle=""; + String unit = parameter.getString("UNIT"); + if(unit==null||unit.length()==0){ + unit=parameterDefination.getString("UNIT"); + } + if(unit==null) unit=""; String[] valueFieldArray = valueFields.split(","); for(String valueField:valueFieldArray){ String colName = (valueField+"_"+parameterID).toUpperCase(); @@ -81,7 +86,7 @@ public class BusinessComponentRuleDW implements ObjectWindowCreator{ doTemp.setHeader(colName, header); doTemp.setVisible(colName, true); doTemp.setHTMLStyle(colName, htmlStyle); - + doTemp.setUnit(colName, unit); if("2".equals(dataType)) doTemp.setCheckFormat(colName, "2"); else if("3".equals(dataType))