Skip to content

L
leaf-hlcm
Commit f21bc161 authored by lizhe's avatar lizhe
Browse files
Options

神钢后续修改

parent b58058c9
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 22 deletions
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
View file @ f21bc161
...@@ -72,7 +72,8 @@ ...@@ -72,7 +72,8 @@
$(ds_id).setQueryParameter("division6",'${/parameter/@division6}'); $(ds_id).setQueryParameter("division6",'${/parameter/@division6}');
$(ds_id).setQueryParameter("division7",'${/parameter/@division7}'); $(ds_id).setQueryParameter("division7",'${/parameter/@division7}');
$(ds_id).setQueryParameter("division8",'${/parameter/@division8}'); $(ds_id).setQueryParameter("division8",'${/parameter/@division8}');
$(ds_id).setQueryParameter("division8",'${/parameter/@division10}'); $(ds_id).setQueryParameter("division9",'${/parameter/@division9}');
$(ds_id).setQueryParameter("division10",'${/parameter/@division10}');
$(ds_id).query(); $(ds_id).query();
}) })
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ f21bc161
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
.item-slideBar{ .item-slideBar{
top:10px; top:10px;
width:600px; width:600px;
height:60px; height:30px;
border:1px solid #009900; border:1px solid #009900;
background-color:#CCFBD5; background-color:#CCFBD5;
color:#009900; color:#009900;
...@@ -174,9 +174,19 @@ ...@@ -174,9 +174,19 @@
// alert(div((H16+H97), (H99+H102-H16)).toFixed(2) * 1); // alert(div((H16+H97), (H99+H102-H16)).toFixed(2) * 1);
var show = down_payment_rate_new * 100; var show = down_payment_rate_new * 100;
if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) { if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) {
unlock_calc_current_window();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%'); if ('${/parameter/@division}'!=91) {
return false; unlock_calc_current_window();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
return false;
}else{
Leaf.SideBar.show({
// msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%',
msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%',
duration: 10000
});
}
} }
} }
...@@ -1544,13 +1554,14 @@ ...@@ -1544,13 +1554,14 @@
H102 = temp_head_records[i].get('column_value') || 0; H102 = temp_head_records[i].get('column_value') || 0;
} }
} }
debugger
if ('${/parameter/@division}'==91 && (((H1<=12 && plus(H54,4.75) != 6.85) || (H1 > 12 && plus(H54,4.75) != 7.3))||H54 < 0)){ // if ('${/parameter/@division}'==91 && (((H1<=12 && plus(H54,4.75) != 6.75) || (H1 > 12 && plus(H54,4.75) != 7.3))||H54 < 0)){
Leaf.SideBar.show({ // Leaf.SideBar.show({
msg:"租赁期为一年及以内的，利率为6.85%，大于一年的7.3%</br>利率最低值不能低于4.75%", // msg:"租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%",
duration: 5000 // duration: 5000
}); // });
} // }
// if(H1<2){ // if(H1<2){
// Leaf.showMessage('${l:PROMPT}', '系统暂时不支持还款期数小于2期的租金计划'); // Leaf.showMessage('${l:PROMPT}', '系统暂时不支持还款期数小于2期的租金计划');
// return false; // return false;
...@@ -1579,7 +1590,8 @@ ...@@ -1579,7 +1590,8 @@
return false; return false;
}else{ }else{
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: "回租首付款比例不低于15%</br>租赁期为一年及以内的，利率为6.85%，大于一年的7.3%</br>利率最低值不能低于4.75%", //msg: "回租首付款比例不低于15%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%",
msg: "回租首付款比例不低于15%",
duration: 5000 duration: 5000
}); });
} }
...@@ -1630,7 +1642,8 @@ ...@@ -1630,7 +1642,8 @@
return false; return false;
}else{ }else{
Leaf.SideBar.show({ Leaf.SideBar.show({
msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.85%，大于一年的7.3%</br>利率最低值不能低于4.75%', // msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%</br>租赁期为一年及以内的，利率为6.75%，大于一年的7.3%</br>利率最低值不能低于4.75%',
msg:'首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%',
duration: 10000 duration: 10000
}); });
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ f21bc161
...@@ -227,7 +227,8 @@ ...@@ -227,7 +227,8 @@
global_flag: 'Y', global_flag: 'Y',
id_num: 0, id_num: 0,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR', calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
}, },
url: url, url: url,
fullScreen: true, fullScreen: true,
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ f21bc161
...@@ -1439,9 +1439,13 @@ ...@@ -1439,9 +1439,13 @@
var show = down_payment_rate_new * 100; var show = down_payment_rate_new * 100;
if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') { if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') {
if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) { if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%'); if(current_record.get('division')!='91'){
return; window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
return;
}
} }
} }
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
...@@ -1535,9 +1539,13 @@ ...@@ -1535,9 +1539,13 @@
var show = down_payment_rate_new * 100; var show = down_payment_rate_new * 100;
if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') { if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') {
if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) { if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%'); if(current_record.get('division')!='91') {
return; window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
return;
}
} }
} }
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ f21bc161
...@@ -282,7 +282,9 @@ ...@@ -282,7 +282,9 @@
global_flag: 'Y', global_flag: 'Y',
id_num: 1, id_num: 1,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR', calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula recreate_L_formula: calc_recreate_L_formula,
division:division
}, },
url: url, url: url,
fullScreen: true, fullScreen: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment