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

1.实际付款明细页面增加动态默认。

Browse Source 
2.更改商务方案页面信息。
3.更改产品信息。
This commit is contained in:
zhangbb 2018-06-27 09:34:09 +08:00
parent 1a6180c507
commit e278bfad2c
6 changed files with 125 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -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"%>
<script type="text/javascript">

45
WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
View File

@ -1,4 +1,11 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@page import="com.amarsoft.are.jbo.BizObject"%>
<%@page import="com.amarsoft.are.jbo.JBOException"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
<%@page import="jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT"%>
<%@page import="jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT"%>
<%@page import="jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP"%>
<%@page import="jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
/*
Author: undefined 2017-06-06
@ -42,6 +49,20 @@
ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo");
ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo");
dwTemp.genHTMLObjectWindow(flowunid);
//添加本方银行默认值
BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,"select * from O where state_=:state AND ACC_TYPE=:accType AND ACCOUNT_TYPE=:accountType")
.setParameter("state","0010").setParameter("accType", "0010").setParameter("accountType", "out_account").getSingleResult(false);
String bank = bo.getAttribute("acc_bank").getString();
String accName = bo.getAttribute("acc_name").getString();
String accNumber = bo.getAttribute("acc_number").getString();
//添加对方银行默认值
BizObject bo2 = JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,
"SELECT DISTINCT O.acc_number,O.open_bank,O.account FROM O RIGHT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON lci.DISTRIBUTOR_ID = O.DISTRIBUTOR_ID AND O.is_main = 'Y' RIGHT JOIN jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP lfit ON lfit.CONTRACT_ID = lci.ID WHERE lfit.FLOWUNID =:flowunid AND lfit.PAY_TYPE = 'pay_type_out'")
.setParameter("flowunid", flowunid).getSingleResult(false);
String bank2 = bo2.getAttribute("open_bank").getString();
String accName2 = bo2.getAttribute("account").getString();
String accNumber2 = bo2.getAttribute("acc_number").getString();
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String[][] sButtons = null;
@ -51,15 +72,35 @@
}else{
sButtons = new String[][]{
{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
//{"true","","Button","ÅúÁ¿ÐÞ¸Ä","ÅúÁ¿ÐÞ¸Ä","batchModify()","","","","btn_icon_delete",""}
{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""}
};
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
$(function(){
setdefaultBank();
setColRequired();
})
function setdefaultBank(){
var bank = "<%=bank%>";
var accName = "<%=accName%>";
var accNumber = "<%=accNumber%>";
var bank2 = "<%=bank2%>";
var accName2 = "<%=accName2%>";
var accNumber2 = "<%=accNumber2%>";
for(var i=0;i<DZ[0][2].length;i++){
if("" == getItemValue(0,i,"BANK")||"null"==getItemValue(0,i,"BANK")){
setItemValue(0,i,"BANK",bank);
setItemValue(0,i,"ACCOUNT",accName);
setItemValue(0,i,"ACC_NUMBER",accNumber);
}
if("" == getItemValue(0,i,"CLIENT_BANK")||"null"==getItemValue(0,i,"CLIENT_BANK")){
setItemValue(0,i,"CLIENT_BANK",bank2);
setItemValue(0,i,"CLIENT_ACCOUNT",accName2);
setItemValue(0,i,"CLIENT_ACCNUMBER",accNumber2);
}
}
}
function setColRequired(){
if("<%=rightType%>" != "ReadOnly"){
for(var i=0;i<DZ[0][2].length;i++){

111
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

11
WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
View File

@ -187,4 +187,13 @@
<Parameter COMPONENTTYPE="PRD0403" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="BusinessEDocsNumber" PARAMETERNAME="合同模板编号" STATUS="1"/>
<Parameter CODESCRIPT="RentRound" CODESOURCE="Code" COMPONENTTYPE="PRD0323" DATATYPE="4" METHODTYPE="JBO" OPERATOR="VALUE" PARAMETERID="CleanMoney" PARAMETERNAME="租赁本金圆整" SELECTTYPE="02" STATUS="1"/>
<Parameter CODESCRIPT="RentRoundType" CODESOURCE="Code" COMPONENTTYPE="PRD0323" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CleanMoneyType" PARAMETERNAME="租赁本金圆整方式" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="IRRReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="HMRReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductRateReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="RateOrInterest" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductType" PARAMETERNAME="利率/费率" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="isDeduct" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="isReturn" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" SELECTTYPE="05" STATUS="1"/></Parameters>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="IRRReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="HMRReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductRateReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="RateOrInterest" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductType" PARAMETERNAME="利率/费率" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="isDeduct" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="isReturn" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" SELECTTYPE="05" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FINAL_PAYMENT_RATIO" PARAMETERNAME="尾款比例" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" STATUS="1"/>
</Parameters>

4
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -209,10 +209,10 @@ public class ProductCondition {
}else{
if(map.containsKey(col)){//产品配置了该费用项
rule=prodSer.getFeeRule(doTemp, map, col,colName,vali);
if("FINA".equals(isFina)){
/*if("FINA".equals(isFina)){
doTemp.setRequired(col, true);
doTemp.setRequired(col+"_"+isFina, true);
}
}*/
}else{
if("FINA".equals(isFina)){
doTemp.setVisible(col+"_"+isFina, false);

25
src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
View File

@ -14,6 +14,7 @@ import jbo.app.tenwa.calc.LC_RENT_PLAN;
import jbo.app.tenwa.calc.VI_LC_FUND_PLAN;
import jbo.app.tenwa.calc.VI_LC_RENT_PLAN;
import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
import jbo.com.tenwa.entity.comm.own.DISTRICT_DISTRIBUTOR_RELATION;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
@ -33,20 +34,20 @@ public class ColRelativeInfo {
.setParameter("distributorID", distributorID).getSingleResult(false);
return bo2 != null?bo2.getAttribute("acc_number").getString():"";
}
//根据合同ID获取经销商名称
public static String getDistributorNameByContractID(String contractID) throws JBOException{
BizObject bo = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"id=:contractID")
.setParameter("contractID", contractID).getSingleResult(false);
String distributorID = bo.getAttribute("distributor_id").getString();
BizObject bo2 = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"DISTRIBUTOR_NO=:distributorID")
.setParameter("distributorID", distributorID).getSingleResult(false);
return bo2 != null?bo2.getAttribute("distributor_name").getString():"";
}
//¸ù¾ÝºÏͬID»ñÈ¡¿Í»§Ãû³Æ
public static String getCustomerNameBycontractID(String contractID) throws JBOException{
BizObject bo = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME,"CONTRACT_ID=:CONTRACT_ID and IS_MAIN='Y'")
.setParameter("CONTRACT_ID", contractID).getSingleResult(false);
return bo != null?bo.getAttribute("customer_name").getString():"";
}
//¸ù¾Ý¿Í»§ID»ñÈ¡¿Í»§Ãû³Æ
public static String getCustNameByCUSTID(String custID) throws JBOException{
BizObject bo = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME,"CUSTOMER_ID=:CUST_ID")
.setParameter("CUST_ID", custID).getSingleResult(false);
BizObject bo = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME,"CONTRACT_ID=:contractID")
.setParameter("contractID",contractID).getSingleResult(false);
return bo != null?bo.getAttribute("customer_name").getString():"";
}