Skip to content

L
leaf-hlcm
Commit 08764f3f authored by 李贺贺's avatar 李贺贺
Browse files
Options

Merge branch 'feature/大额尾款——报价维护相关问题修复' into develop

parents 675ef88e 24dd2696
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 10 deletions
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 08764f3f
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_doc_quotation_link_id" <a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_doc_quotation_link_id"
url="${/request/@context_path}/modules/hls/HLS500/hls_fin_doc_quotation.lsc"/> url="${/request/@context_path}/modules/hls/HLS500/hls_fin_doc_quotation.lsc"/>
<a:link id="principal_eq_pymt_adj_link_n" model="hls.HLS500N.query_principal_eq_pymt_adj" modelaction="update"/> <a:link id="${/parameter/@layout_code}_principal_eq_pymt_adj_link_n" model="hls.HLS500N.query_principal_eq_pymt_adj" modelaction="update"/>
<a:link id="${/parameter/@layout_code}hls_bp_master_query_link" <a:link id="${/parameter/@layout_code}hls_bp_master_query_link"
url="${/request/@context_path}/modules/hls/HLS215N/hls_bp_master_query.lview"/> url="${/request/@context_path}/modules/hls/HLS215N/hls_bp_master_query.lview"/>
...@@ -804,13 +804,13 @@ ...@@ -804,13 +804,13 @@
var quotation_record = $(prj_quotation_ds_id).getCurrentRecord(); var quotation_record = $(prj_quotation_ds_id).getCurrentRecord();
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') { if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
if (value == 'HL_PRICR_E' || value == 'HL_PRICR_EN'){ if (value == 'HL_PRICR_E' || value == 'HL_PRICR_EN'){
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'block'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'block';
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'block'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'block';
}else{ }else{
quotation_record.set('large_balance','NO'); quotation_record.set('large_balance','NO');
quotation_record.set('large_balance_n','否'); quotation_record.set('large_balance_n','否');
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
} }
} }
} }
...@@ -850,8 +850,9 @@ ...@@ -850,8 +850,9 @@
} }
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger; // debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
if (ds_id == ds.id && ds_id) { if (ds_id == ds.id && ds_id) {
if (record.get('pay_method') == 'WIRE_TRANSFER') { if (record.get('pay_method') == 'WIRE_TRANSFER') {
record.getField('bank_account_id').setReadOnly(true); record.getField('bank_account_id').setReadOnly(true);
...@@ -916,13 +917,15 @@ ...@@ -916,13 +917,15 @@
record.getField('branch_code').setRequired(false); record.getField('branch_code').setRequired(false);
record.getField('branch_code_n').setRequired(false); record.getField('branch_code_n').setRequired(false);
} }
}
if (prj_quotation_ds_id == ds.id && ds_id){
var bp_code = '${/model/user_agent_description/record/@bp_code}';
if (!Ext.isEmpty(bp_code)){ if (!Ext.isEmpty(bp_code)){
// if (bp_code == 'C00010168' || bp_code == 'C00010198' || bp_code == 'C00010170') { // if (bp_code == 'C00010168' || bp_code == 'C00010198' || bp_code == 'C00010170') {
if (bp_code == 'D00000041' || bp_code =='D00010001' || bp_code=='D00000026') { if (bp_code == 'D00000041' || bp_code =='D00010001' || bp_code=='D00000026') {
//=============================== //===============================
// var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); // var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation'); // var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var quotation_record = $(prj_quotation_ds_id).getCurrentRecord(); var quotation_record = $(prj_quotation_ds_id).getCurrentRecord();
if ($(ds_id).getAt(0).get('business_type') == 'LEASE') { if ($(ds_id).getAt(0).get('business_type') == 'LEASE') {
if (quotation_record.get('price_list') == 'HL_PRICR_E' || quotation_record.get('price_list') == 'HL_PRICR_EN'){ if (quotation_record.get('price_list') == 'HL_PRICR_E' || quotation_record.get('price_list') == 'HL_PRICR_EN'){
...@@ -1123,7 +1126,7 @@ ...@@ -1123,7 +1126,7 @@
if (record.get('large_balance') == 'YES') { if (record.get('large_balance') == 'YES') {
var project_number = current_record.get('project_number'); var project_number = current_record.get('project_number');
Leaf.request({ Leaf.request({
url: $('principal_eq_pymt_adj_link_n').getUrl(), url: $('${/parameter/@layout_code}_principal_eq_pymt_adj_link_n').getUrl(),
para: {p_project_number: project_number}, para: {p_project_number: project_number},
scope: this, scope: this,
success: function (res) { success: function (res) {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 08764f3f
...@@ -711,6 +711,7 @@ ...@@ -711,6 +711,7 @@
} }
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
if (ds_id == ds.id && ds_id) { if (ds_id == ds.id && ds_id) {
if (record.get('pay_method') == 'WIRE_TRANSFER') { if (record.get('pay_method') == 'WIRE_TRANSFER') {
record.getField('bank_branch_name').setReadOnly(true); record.getField('bank_branch_name').setReadOnly(true);
...@@ -778,6 +779,35 @@ ...@@ -778,6 +779,35 @@
record.getField('branch_code_n').setRequired(false); record.getField('branch_code_n').setRequired(false);
} }
} }
if (prj_quotation_ds_id == ds.id && ds_id){
var bp_code = '${/model/user_agent_description/record/@bp_code}';
if (!Ext.isEmpty(bp_code)){
// if (bp_code == 'C00010168' || bp_code == 'C00010198' || bp_code == 'C00010170') {
if (bp_code == 'D00000041' || bp_code =='D00010001' || bp_code=='D00000026') {
//===============================
// var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
// var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var quotation_record = $(prj_quotation_ds_id).getCurrentRecord();
if ($(ds_id).getAt(0).get('business_type') == 'LEASE') {
if (quotation_record.get('price_list') == 'HL_PRICR_E' || quotation_record.get('price_list') == 'HL_PRICR_EN'){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'block';
}else{
quotation_record.set('large_balance','NO');
quotation_record.set('large_balance_n','否');
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
}
}
}else{
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
}
}else {
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'block';
}
}
}; };
//更新时调用 //更新时调用
...@@ -787,7 +817,7 @@ ...@@ -787,7 +817,7 @@
var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master'); var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
; ;
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail'); var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
if (prj_project_ds_id == ds.id && prj_project_ds_id) { if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if (name == "payment_deduction" && value=="DOWN_PAYMENT_DEDUCTION") { if (name == "payment_deduction" && value=="DOWN_PAYMENT_DEDUCTION") {
//业务类型回租时，默认只读“首付款抵扣”选项 //业务类型回租时，默认只读“首付款抵扣”选项
...@@ -959,6 +989,28 @@ ...@@ -959,6 +989,28 @@
} }
} }
} }
var bp_code='${/model/user_agent_description/record/@bp_code}';
if (!Ext.isEmpty(bp_code)){
// if (bp_code == 'C00010168' || bp_code == 'C00010198' || bp_code == 'C00010170'){
if (bp_code == 'D00000041' || bp_code =='D00010001' || bp_code=='D00000026') {
if (prj_quotation_ds_id == ds.id){
if (name == 'price_list' && value){
var quotation_record = $(prj_quotation_ds_id).getCurrentRecord();
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
if (value == 'HL_PRICR_E' || value == 'HL_PRICR_EN'){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'block';
}else{
quotation_record.set('large_balance','NO');
quotation_record.set('large_balance_n','否');
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
}
}
}
}
}
}
}; };
//附件打包下载 //附件打包下载
window['${/parameter/@layout_code}_ACY_USER_BUTTON1_layout_dynamic_tab_click'] = function () { window['${/parameter/@layout_code}_ACY_USER_BUTTON1_layout_dynamic_tab_click'] = function () {
......
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