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 zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-12-05 16:11:14 +08:00
commit 8e47989cd4
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/LBRegisterContractInfoD.jsp
View File

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

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

File diff suppressed because one or more lines are too long

27
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -698,6 +698,10 @@
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="FACTORY_ACCESSORIES" label="原厂配件费" type="STRING" length="22" scale="2" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
@ -986,6 +990,10 @@
<attribute name="FACTORY_ACCESSORIES" label="原厂配件费" type="STRING" length="22" scale="2" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
<managerProperties>
@ -1313,6 +1321,10 @@
<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
@ -2560,6 +2572,10 @@
<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
@ -2758,6 +2774,10 @@
<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
@ -3088,10 +3108,9 @@
<attribute name="RATE" label="税率" type="STRING" length="32"/>
<attribute name="ADDITIONAL_RATE" label="附加税" type="STRING" length="32"/>
<attribute name="INTEREST_DAY_TYPE" label="计息日计算方式" type="STRING" length="32"/>
<attribute name="PURCHASE_TAX" label="购置税" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX" label="购置税" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_FINA" label="购置税是否参与融资" type="STRING" length="32"/>
<attribute name="INSURANCE_PREMIUM" label="保险费" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_PREMIUM_FINA" label="保险费是否参与融资" type="STRING" length="32"/>
<attribute name="INCIDENTAL" label="杂费" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_FINA" label="杂费是否参与融资" type="STRING" length="32"/>
@ -3127,6 +3146,10 @@
<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="TABLEWARE_FEE_RATIO" label="加装费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INCIDENTAL_RATIO" label="杂费比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_RATIO" label="购置税比例" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_RATIO" label="保险费比例" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>