From 91d42e0a0a445c08fe6ef091b9f8b6e2a3804617 Mon Sep 17 00:00:00 2001 From: yexuan Date: Mon, 25 Jun 2018 17:48:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?APP=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml | 47 +++----------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml index 7d4dafbaa..2f914758f 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app_fresh.xml @@ -394,47 +394,12 @@ length="1000" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + From 44469f75bce2a913ba88938b2999e80dd27b206a Mon Sep 17 00:00:00 2001 From: yexuan Date: Mon, 25 Jun 2018 18:26:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9APP=E5=88=86=E7=BB=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/AppFresh/AppPage/AppLibraryAdd.jsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp b/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp index fcc77abc1..89d3b2d3a 100644 --- a/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp +++ b/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp @@ -1,6 +1,7 @@ <%@page import="jbo.awe.AWE_DO_CATALOG"%> - <%@ page contentType="text/html; charset=GBK"%><%@ - include file="/Frame/resources/include/include_begin_list.jspf"%><% +<%@ page contentType="text/html; charset=GBK"%><%@ +include file="/Frame/resources/include/include_begin_info.jspf"%> +<% //ò String GROUP_CODE = CurPage.getParameter("GROUP_CODE"); if (GROUP_CODE == null) @@ -26,6 +27,7 @@ } function saveRecord() { + debugger; var isList = getItemValue(0, getRow(0), 'ISLIST'); var selName = 'SelectDo'; var GROUP_CODE = ""; From b3716320304163361d57d3981d49912b68e43f3c Mon Sep 17 00:00:00 2001 From: yexuan Date: Wed, 27 Jun 2018 09:23:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/AppFresh/AppPage/AppLibraryAdd.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp b/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp index 89d3b2d3a..a0a28337c 100644 --- a/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp +++ b/WebContent/AppFresh/AppPage/AppLibraryAdd.jsp @@ -1,6 +1,6 @@ <%@page import="jbo.awe.AWE_DO_CATALOG"%> -<%@ page contentType="text/html; charset=GBK"%><%@ -include file="/Frame/resources/include/include_begin_info.jspf"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@include file="/Frame/resources/include/include_begin_info.jspf"%> <% //ò String GROUP_CODE = CurPage.getParameter("GROUP_CODE"); From e278bfad2c3b4407b465cc25071eef6f8c01e7d4 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 27 Jun 2018 09:34:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E9=BB=98=E8=AE=A4=E3=80=82=202.=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=95=86=E5=8A=A1=E6=96=B9=E6=A1=88=E9=A1=B5=E9=9D=A2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=203.=E6=9B=B4=E6=94=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LoanBasicInfo.jsp | 2 +- .../ActualPayment/ActualPaymentTempList.jsp | 45 ++++++- .../etc/app/component/component-config.xml | 111 +++++++++--------- .../component/component-parameter-config.xml | 11 +- .../reckon/product/ProductCondition.java | 4 +- .../dict/als/manage/ColRelativeInfo.java | 25 ++-- 6 files changed, 125 insertions(+), 73 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index d48d75542..f68a1840a 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -153,7 +153,7 @@ String sButtons[][] = { //{"true","All","Button","","","reloadSelf()","","","",""}, {"true","","Button","","","saveRecord()","","","","btn_icon_save"}, - {((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","ͻ","ͻ","importCustomerQuot()","","","","btn_icon_edit"} + // {((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","ͻ","ͻ","importCustomerQuot()","","","","btn_icon_edit"} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>