From b3fdc2a5639eb96add098529121c8c3c7565d77b Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 4 Dec 2018 20:44:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E5=AF=84=E9=80=81=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterExpress/LBRegisterContractInfoD.jsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp index b7075bb51..7628cb542 100644 --- a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp +++ b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp @@ -8,6 +8,7 @@ String contract_number = CurPage.getParameter("FlowKey"); String ContractId = CurPage.getParameter("ContractId"); String customerName = Sqlca.getString("SELECT customer_name FROM lb_union_lessee WHERE contract_id='"+ContractId+"'"); + String customer_id = Sqlca.getString("SELECT customer_id FROM lb_union_lessee WHERE contract_id='"+ContractId+"'"); String sPrevUrl = CurPage.getParameter("PrevUrl"); if(sPrevUrl == null) sPrevUrl = ""; @@ -17,11 +18,11 @@ //doTemp.setColTips("", "测试"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - dwTemp.ReadOnly = "1";//只读模式 + //dwTemp.ReadOnly = "1";//只读模式 dwTemp.genHTMLObjectWindow(contract_number); String sButtons[][] = { - //{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} }; sButtonPosition = "south"; @@ -33,6 +34,7 @@ if(contractNumber==""){ setItemValue(0,0,"CONTRACT_NUMBER","<%=contract_number%>"); setItemValue(0,0,"CUSTOMER_NAME","<%=customerName%>"); + setItemValue(0,0,"CUSTOMER_ID","<%=customer_id%>"); } } From 2ba3cec261b2136e576a26820df4324f2a0e47fc Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 5 Dec 2018 09:42:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=B1=BD=E8=BD=A6=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E8=9E=8D=E8=B5=84=E9=A1=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E9=AA=8C=E8=AF=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc/app/component/component-config.xml | 8 +++--- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 27 +++++++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 64c22207a..840c7f34c 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1096,13 +1096,15 @@ - - + + + + - + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 0b4775fbb..9eb015709 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -698,6 +698,10 @@ + + + + @@ -986,6 +990,10 @@ + + + + @@ -1313,6 +1321,10 @@ + + + + @@ -2560,6 +2572,10 @@ + + + + @@ -2758,6 +2774,10 @@ + + + + @@ -3088,10 +3108,9 @@ - + - @@ -3127,6 +3146,10 @@ + + + +