anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into develop

Browse Source
This commit is contained in:
luojian 2018-07-24 17:06:03 +08:00
commit 46234a9024
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
View File

@ -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%>');
}

2
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
View File

@ -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",""},
};
}

26
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -3998,6 +3998,32 @@
</managerProperties>
</manager>
</class>
<class name="LB_DISCOUNT" label="" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="64"/>
<attribute name="CONTRACT_NO" label="合同编号" type="STRING" length="64"/>
<attribute name="CAR_BRAND" label="品牌" type="STRING" length="64"/>
<attribute name="FRAME_NUMBER" label="车架号" type="STRING" length="64"/>
<attribute name="DISCOUNT_MONEY" label="贴息金额" type="STRING" length="64"/>
<attribute name="FIELD1" label="FIELD1" type="STRING" length="64"/>
<attribute name="FIELD2" label="FIELD2" type="STRING" length="64"/>
<attribute name="FIELD3" label="FIELD3" type="STRING" length="64"/>
<attribute name="FIELD4" label="FIELD4" type="STRING" length="64"/>
<attribute name="FIELD5" label="FIELD5" type="STRING" length="64"/>
<attribute name="INPUTUSERID" label="INPUTUSERID" type="STRING" length="64"/>
<attribute name="INPUTORGID" label="INPUTORGID" type="STRING" length="64"/>
<attribute name="INPUTTIME" label="系统导入日期" type="STRING" length="64"/>
<attribute name="UPDATEUSERID" label="UPDATEUSERID" type="STRING" length="64"/>
<attribute name="UPDATEORGID" label="UPDATEORGID" type="STRING" length="64"/>
<attribute name="UPDATETIME" label="UPDATETIME" type="STRING" length="64"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="lb_discount" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
</package>
<package name="jbo.com.tenwa.lease.carbrand" >
<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">

1
src/com/tenwa/channelportal/action/generativecontract/WordToPDFUtil.java
View File

@ -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);