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

This commit is contained in:
user 2018-07-18 20:14:06 +08:00
commit ebe21e5329
2 changed files with 3 additions and 2 deletions

View File

@ -790,7 +790,8 @@ function getRatioByMoney(e){
var firstPaymentRatio = getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0");
var ratio = 100 - Number(firstPaymentRatio);
if(ratio > 0 && allMoney != 0) {
cleanLeaseMoney = allMoney * (ratio / 100);
//cleanLeaseMoney = allMoney * (ratio / 100);
cleanLeaseMoney = allMoney-equipAmt*firstPaymentRatio/100;
setItemValue(0, 0, "RENT_RATIO", ((cleanLeaseMoney / equipAmt) * 100).toFixed(6));
setItemValue(0, 0, "CLEAN_LEASE_MONEY", cleanLeaseMoney);
}

View File

@ -71,7 +71,7 @@ jQuery(function(){
loadMask = new tracywindyLoadMask(document.body,"数据加载中 请稍后...");
}
var height=$("body").height();
$("#id_menu_tabs_menu").height(height);
$("#id_menu_tabs_menu").height(height-30 <=0 ? "100%": height-30);
initDeptTree(sOrgId,"");
});