From 0f0a79286bd0521c24ffa36ddeecf1a3b931ce34 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 24 Jul 2018 16:24:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0JBO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index aaf5d2a06..83b739e52 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3998,6 +3998,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From ef81b69f30f805c15a884fc2f8f1e162fe7d49cd Mon Sep 17 00:00:00 2001 From: liuz Date: Tue, 24 Jul 2018 16:34:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=94=B6?= =?UTF-8?q?=E5=8F=96=E5=AD=97=E6=AE=B5=E5=80=BC=E7=9A=84=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=9D=A1=E7=9B=AE=E6=95=B0=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp | 9 +++++++-- .../DistributorApproval/LDistributorAccountList.jsp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp index 83ce2051c..86e3bf924 100644 --- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp +++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp @@ -29,8 +29,11 @@ if("ReadOnly".equals(rightType)){ dwTemp.ReadOnly = "1";//ֻģʽ } - String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT where acc_number='755915678910202'"); - String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT where acc_number='755915678910202'"); + String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1"); + String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1"); + + String acc = Sqlca.getString("select acc_number from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); + String acco = Sqlca.getString("select account from DISTRIBUTOR_ACCOUNT where distributor_id="+"'"+DistributorNo+"'"+" limit 0,1"); dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); dwTemp.getDataObject().setVisible("CAUTION_MONEY", true); String sButtons[][] = { @@ -42,6 +45,8 @@ window.onload=function(){ setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>'); setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>'); + setItemValue(0,0,"ACCOUNT_INFO",'<%=acc%>'); + setItemValue(0,0,"ACCOUNT",'<%=acco%>'); } diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp index ab9becbc1..44b56d756 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp @@ -50,7 +50,7 @@ //{temp,"","Button","","鿴/޸","view()","","","","btn_icon_detail"}, {temp,"","Button","޸","޸","viewAndEdit()","","","","btn_icon_detail",""}, //{"true","All","Button","ɾ","ɾ","if(confirm('ȷʵҪɾ?'))as_delete(0)","","","","btn_icon_delete",""}, - {temp,"All","Button","ɾ","ɾ","if(confirm('ȷʵҪɾ?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + {temp,"All","Button","ɾ","ɾ","if(confirm('ȷʵҪɾ?'))as_delete(0)","","","","btn_icon_delete",""}, }; } From 6aa50ab011897d145ac10f0accc7a4c72ab4d73d Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 24 Jul 2018 16:44:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0JBO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 83b739e52..22fbbc9e1 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3998,13 +3998,13 @@ - + - - - - - + + + + + @@ -4012,7 +4012,7 @@ - + From d4c978f941282ab7d78ac6e402b2974ae1fd99ff Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 24 Jul 2018 16:52:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=86LibreOffice=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0quartz.properties=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channelportal/action/generativecontract/WordToPDFUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java index 18b682708..b598d93ca 100644 --- a/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java +++ b/src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java @@ -27,7 +27,6 @@ public class WordToPDFUtil { logger.info("============תpdfʼ============"); try{ String path = QuartzPropertiesUtil.get("libreOffice_path"); -// String cmd = "/opt/libreoffice5.4/program/soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath; String cmd = path+"\\soffice --headless -invisible --convert-to pdf "+srcPath+" --outdir "+desPath; logger.info("python:"+cmd); process = Runtime.getRuntime().exec(cmd);