Skip to content

L
leaf-hlcm
Commit a1ac21d0 authored by Luochenglong's avatar Luochenglong
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 61c1f9ae 99e3a104
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 22 deletions
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ a1ac21d0
...@@ -405,8 +405,11 @@ ...@@ -405,8 +405,11 @@
success: function (res) { success: function (res) {
on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}'); on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
get_warning_message(res.result.warning_message); get_warning_message(res.result.warning_message);
if('${/parameter/@layout_code}'!='CCR_BEFORE_SIGN'){
recreate_H_formula = 'N'; recreate_H_formula = 'N';
recreate_L_formula = 'N'; recreate_L_formula = 'N';
}
open_after_save_execute(); open_after_save_execute();
}, },
failure: function () { failure: function () {
...@@ -956,6 +959,8 @@ ...@@ -956,6 +959,8 @@
var contract_status = res.result.contract_status; var contract_status = res.result.contract_status;
var sign_contract_status = res.result.sign_contract_status; var sign_contract_status = res.result.sign_contract_status;
if (sign_contract_status == 'SIGN' || sign_contract_status == 'SIGNING' || contract_status == 'NEW' || contract_status == 'INCEPT_RETURN') { if (sign_contract_status == 'SIGN' || sign_contract_status == 'SIGNING' || contract_status == 'NEW' || contract_status == 'INCEPT_RETURN') {
//签约前合同变更才放开部分字段，其他维持原合同起租时租赁日调整逻辑
/*if('${/parameter/@layout_code}'!='CCR_BEFORE_SIGN'){*/
for (var i = 0; i < headRecords.length; i++) { for (var i = 0; i < headRecords.length; i++) {
var column_name = headRecords[i].get('column_name'); var column_name = headRecords[i].get('column_name');
if (column_name != "lease_start_date" && column_name != "contract_inception_date") { if (column_name != "lease_start_date" && column_name != "contract_inception_date") {
...@@ -965,6 +970,22 @@ ...@@ -965,6 +970,22 @@
headRecords[i].getField('column_value_c').setReadOnly(true); headRecords[i].getField('column_value_c').setReadOnly(true);
} }
} }
/* }else{
for (var i = 0; i < headRecords.length; i++) {
var column_name = headRecords[i].get('column_name');
if (column_name != "lease_start_date" && column_name != "contract_inception_date"&&column_name != "other_fee"&&column_name != "lease_times"&&column_name != "int_rate_display"
&&column_name != "down_payment"&&column_name != "third_party_deposit"&&column_name != "balloon_ratio") {
headRecords[i].set('input_mode', 'READONLY');
headRecords[i].set('readonly_input_mode', 'TRUE');
headRecords[i].getField('column_value').setReadOnly(true);
headRecords[i].getField('column_value_c').setReadOnly(true);
}
}
}*/
} else { } else {
for (var i = 0; i < headRecords.length; i++) { for (var i = 0; i < headRecords.length; i++) {
headRecords[i].set('input_mode', 'READONLY'); headRecords[i].set('input_mode', 'READONLY');
...@@ -988,7 +1009,7 @@ ...@@ -988,7 +1009,7 @@
} }
if ('${/parameter/@document_category}' == 'PROJECT') { if ('${/parameter/@document_category}' == 'PROJECT'||'${/parameter/@document_category}' == 'CONTRACT') {
Leaf.request({ Leaf.request({
url: $('prj_check_prj_record_link_id').getUrl(), url: $('prj_check_prj_record_link_id').getUrl(),
para: { para: {
...@@ -1437,9 +1458,8 @@ ...@@ -1437,9 +1458,8 @@
$('${/parameter/@layout_code}_F_QUOTATION_N_prj_quotation_ds').query(); $('${/parameter/@layout_code}_F_QUOTATION_N_prj_quotation_ds').query();
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_ds').query(); $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_ds').query();
} else if ('${/parameter/@document_category}' == 'CONTRACT') { } else if ('${/parameter/@document_category}' == 'CONTRACT') {
if($('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds')){
$('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query(); if( $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds')){
}if( $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds')){
$('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds').query(); $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds').query();
} }
...@@ -1592,6 +1612,7 @@ ...@@ -1592,6 +1612,7 @@
return false; return false;
} }
if(H44!=100){ if(H44!=100){
Leaf.showMessage('${l:PROMPT}', '留购金需要为100元'); Leaf.showMessage('${l:PROMPT}', '留购金需要为100元');
unlock_calc_current_window(); unlock_calc_current_window();
return false; return false;
...@@ -1618,7 +1639,6 @@ ...@@ -1618,7 +1639,6 @@
}); });
} }
} }
} }
lock_calc_current_window('${l:HLS.CALCULATING}'); lock_calc_current_window('${l:HLS.CALCULATING}');
...@@ -1869,8 +1889,10 @@ ...@@ -1869,8 +1889,10 @@
success: function (res) { success: function (res) {
on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}'); on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
//get_warning_message(res.result.warning_message); //get_warning_message(res.result.warning_message);
if('${/parameter/@layout_code}'!='CCR_BEFORE_SIGN'){
recreate_H_formula = 'N'; recreate_H_formula = 'N';
recreate_L_formula = 'N'; recreate_L_formula = 'N';
}
//open_after_save_execute(); //open_after_save_execute();
hls_hls500_user_button1(); hls_hls500_user_button1();
}, },
...@@ -1907,8 +1929,11 @@ ...@@ -1907,8 +1929,11 @@
success: function (res) { success: function (res) {
on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}'); on_calc_success_query('${/parameter/@dsId}', '${/parameter/@document_category}');
//get_warning_message(res.result.warning_message); //get_warning_message(res.result.warning_message);
if('${/parameter/@layout_code}'!='CCR_BEFORE_SIGN'){
recreate_H_formula = 'N'; recreate_H_formula = 'N';
recreate_L_formula = 'N'; recreate_L_formula = 'N';
}
//open_after_save_execute(); //open_after_save_execute();
hls_hls500_user_button2(); hls_hls500_user_button2();
// unlock_calc_current_window(); // unlock_calc_current_window();
...@@ -1936,9 +1961,7 @@ ...@@ -1936,9 +1961,7 @@
$('${/parameter/@layout_code}_F_QUOTATION_N_prj_quotation_ds').query(); $('${/parameter/@layout_code}_F_QUOTATION_N_prj_quotation_ds').query();
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_ds').query(); $('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_ds').query();
} else if ('${/parameter/@document_category}' == 'CONTRACT') { } else if ('${/parameter/@document_category}' == 'CONTRACT') {
if($('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds')){
$('CONTRACT_CREATE_INC_G_CASHFLOW_1_con_contract_cashflow_ds').query();
}
if( $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds')){ if( $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds')){
$('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds').query(); $('${/parameter/@layout_code}_G_CASHFLOW_1_con_contract_cashflow_ds').query();
......
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