Skip to content

L
leaf-hlcm
Commit 6b21ef8c authored by 王炜's avatar 王炜
Browse files
Options

资管费涉及报价单调整权限显隐调整以及相关代码review修复20240119

parent 701228f1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 466 additions and 277 deletions
src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calc_config_ln.lwm
View file @ 6b21ef8c
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
<bm:query-field field="display_flag" queryExpression="d.display_flag=${@display_flag}"/> <bm:query-field field="display_flag" queryExpression="d.display_flag=${@display_flag}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression=" ((d.column_name not in('BTB_INTEREST','BTB_FEE') and nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')!='Y') OR nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')='Y')"></bm:data-filter>
<bm:data-filter name="query" expression="(d.price_list =nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})) and d.layout_area_seq = &apos;L&apos; and lower(d.column_name)=nvl(${@column_name},lower(d.column_name)) and d.price_list=p.price_list)"/> <bm:data-filter name="query" expression="(d.price_list =nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})) and d.layout_area_seq = &apos;L&apos; and lower(d.column_name)=nvl(${@column_name},lower(d.column_name)) and d.price_list=p.price_list)"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS500N/hls_fin_calc_config_hd_n.lwm
View file @ 6b21ef8c
...@@ -111,5 +111,6 @@ ...@@ -111,5 +111,6 @@
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="(t.layout_area_seq = &apos;H&apos; and t.price_list=p.price_list and t.price_list = nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})))"/> <bm:data-filter enforceOperations="query" expression="(t.layout_area_seq = &apos;H&apos; and t.price_list=p.price_list and t.price_list = nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})))"/>
<bm:data-filter enforceOperations="query" expression=" ((t.column_name not in('BTB_INT_RATE') and nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')!='Y') OR nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')='Y')"></bm:data-filter>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ500D/prj_project_get_asset_fee_flag.lwm 0 → 100644
View file @ 6b21ef8c
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="true">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((SELECT 'Y'
from dual
where ${/parameter/@project_id} is null
and exists
(select 1
from asset_management_fee t,
hls_bp_master_agent_division d
where t.bp_id = ${/parameter/@invoice_agent_id}
and d.agent_division_id = t.agent_division_id
and d.division = ${/parameter/@division}
AND t.wfl_status = 'APPROVED')
union
select 'Y'
from dual
where ${/parameter/@project_id} is not null
and exists
(select 1
from asset_management_fee t,
hls_bp_master_agent_division d,
prj_project p
where t.bp_id = p.INVOICE_AGENT_ID
and d.agent_division_id = t.agent_division_id
and d.division = p.division
AND t.wfl_status = 'APPROVED'
and p.project_id = ${/parameter/@project_id})),
'N') asset_fee_flag
from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ501/prj_quotation_save.lwm
View file @ 6b21ef8c
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
<bm:operations> <bm:operations>
<bm:operation name="insert"> <bm:operation name="insert">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
declare
v_int_rate_display prj_quotation.int_rate_display%type;
begin begin
select decode(${@hd_user_col_v06},'Y',${@int_rate_display},null) into
v_int_rate_display from dual;
prj_quotation_pkg.insert_prj_quotation( prj_quotation_pkg.insert_prj_quotation(
p_quotation_id=>${@quotation_id}, p_quotation_id=>${@quotation_id},
p_document_category=>${@document_category}, p_document_category=>${@document_category},
...@@ -49,7 +53,11 @@ ...@@ -49,7 +53,11 @@
p_ref_d02=>to_date(${@ref_d02},'yyyy-mm-dd hh24:mi:ss'), p_ref_d02=>to_date(${@ref_d02},'yyyy-mm-dd hh24:mi:ss'),
p_ref_d03=>to_date(${@ref_d03},'yyyy-mm-dd hh24:mi:ss'), p_ref_d03=>to_date(${@ref_d03},'yyyy-mm-dd hh24:mi:ss'),
p_ref_d04=>to_date(${@ref_d04},'yyyy-mm-dd hh24:mi:ss'), p_ref_d04=>to_date(${@ref_d04},'yyyy-mm-dd hh24:mi:ss'),
p_ref_d05=>to_date(${@ref_d05},'yyyy-mm-dd hh24:mi:ss')); p_ref_d05=>to_date(${@ref_d05},'yyyy-mm-dd hh24:mi:ss'),
p_int_rate_display=>v_int_rate_display,
p_btb_int_rate=>${@btb_int_rate},
p_hd_user_col_v06=>${@hd_user_col_v06}
);
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
<bm:parameters> <bm:parameters>
...@@ -59,7 +67,11 @@ ...@@ -59,7 +67,11 @@
</bm:operation> </bm:operation>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
declare
v_int_rate_display prj_quotation.int_rate_display%type;
begin begin
select decode(${@hd_user_col_v06},'Y',${@int_rate_display},null) into
v_int_rate_display from dual;
prj_quotation_pkg.update_prj_quotation( prj_quotation_pkg.update_prj_quotation(
p_quotation_id=>${@quotation_id}, p_quotation_id=>${@quotation_id},
p_document_category=>${@document_category}, p_document_category=>${@document_category},
...@@ -100,7 +112,10 @@ ...@@ -100,7 +112,10 @@
p_ref_d03=>to_date(${@ref_d03},'yyyy-mm-dd hh24:mi:ss'), p_ref_d03=>to_date(${@ref_d03},'yyyy-mm-dd hh24:mi:ss'),
p_ref_d04=>to_date(${@ref_d04},'yyyy-mm-dd hh24:mi:ss'), p_ref_d04=>to_date(${@ref_d04},'yyyy-mm-dd hh24:mi:ss'),
p_ref_d05=>to_date(${@ref_d05},'yyyy-mm-dd hh24:mi:ss'), p_ref_d05=>to_date(${@ref_d05},'yyyy-mm-dd hh24:mi:ss'),
p_btb_int_rate=>${@btb_int_rate}); p_int_rate_display=>v_int_rate_display,
p_btb_int_rate=>${@btb_int_rate},
p_hd_user_col_v06=>${@hd_user_col_v06}
);
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
<bm:parameters> <bm:parameters>
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ 6b21ef8c
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
<p:set field="/parameter/@dynamic_base_table" value="null"/> <p:set field="/parameter/@dynamic_base_table" value="null"/>
<a:model-query defaultwhereclause="(d.layout_area_seq = &apos;H&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="hd_parameter_sql_value"/> <a:model-query defaultwhereclause="(d.layout_area_seq = &apos;H&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="hd_parameter_sql_value"/>
<a:model-query defaultwhereclause="(d.layout_area_seq = &apos;L&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="ln_parameter_sql_value"/> <a:model-query defaultwhereclause="(d.layout_area_seq = &apos;L&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="ln_parameter_sql_value"/>
<a:model-query defaultWhereClause="cc.division = hd.division and cc.contract_id=${/parameter/@document_id}" model="hls.HLS500N.check_con_record_date" rootPath="full_elec_sign"/>
<p:exception-handles> <p:exception-handles>
<p:catch Exception="*"> <p:catch Exception="*">
<p:action name="HandleException"/> <p:action name="HandleException"/>
<p:action name="CreateErrorResponse"/> <p:action name="CreateErrorResponse"/>
</p:catch> </p:catch>
</p:exception-handles> </p:exception-handles>
<a:model-query defaultWhereClause="cc.division = hd.division and cc.contract_id=${/parameter/@document_id}" model="hls.HLS500N.check_con_record_date" rootPath="full_elec_sign"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<!-- <a:link id="hls_parameter_value_lov_link" url="${/request/@context_path}/modules/hls/HLS500/hls_parameter_value_lov.lview"/> --> <!-- <a:link id="hls_parameter_value_lov_link" url="${/request/@context_path}/modules/hls/HLS500/hls_parameter_value_lov.lview"/> -->
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
hd_calc_orign_value = [], hd_calc_orign_value = [],
ln_calc_formula_orign_value = [], ln_calc_formula_orign_value = [],
ln_calc_orign_value = []; ln_calc_orign_value = [];
var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
Leaf.Masker.mask(document.documentElement, '${l:HLS.LOADING}'); Leaf.Masker.mask(document.documentElement, '${l:HLS.LOADING}');
function hls_hls500_3JD() { function hls_hls500_3JD() {
...@@ -553,6 +553,7 @@ ...@@ -553,6 +553,7 @@
function parameter_function(record, name) { function parameter_function(record, name) {
var field = record.getField(name), var field = record.getField(name),
ds = $('hls_fin_calculator_hd_ds'),
input_mode = record.get('input_mode'); input_mode = record.get('input_mode');
set_field_input_mode(record, field, name, input_mode); set_field_input_mode(record, field, name, input_mode);
special_editor_function(ds, record, name); special_editor_function(ds, record, name);
...@@ -681,6 +682,7 @@ ...@@ -681,6 +682,7 @@
set_field_input_mode(record, field, name, 'READONLY'); set_field_input_mode(record, field, name, 'READONLY');
} }
} }
if (editor_record.get('validation_type') == 'NUMBERFIELD') { if (editor_record.get('validation_type') == 'NUMBERFIELD') {
if (editor_record.get('allow_decimal') == 'TRUE') { if (editor_record.get('allow_decimal') == 'TRUE') {
field.setPropertity('allowdecimals', true); field.setPropertity('allowdecimals', true);
...@@ -860,7 +862,7 @@ ...@@ -860,7 +862,7 @@
recreate_L_formula = 'N'; recreate_L_formula = 'N';
} }
} }
//非全电签约电子合同起租日校验 18083 //非全电签约电子合同起租日校验
if('${/parameter/@layout_code}'=='CCR_BEFORE_SIGN'){ if('${/parameter/@layout_code}'=='CCR_BEFORE_SIGN'){
if('${/model/full_elec_sign/record/@full_elec_sign}'!='Y' && '${/model/full_elec_sign/record/@sign_type}'=='ELE_SIGN'){ if('${/model/full_elec_sign/record/@full_elec_sign}'!='Y' && '${/model/full_elec_sign/record/@sign_type}'=='ELE_SIGN'){
if (record.get('column_code') == 'H2'){ if (record.get('column_code') == 'H2'){
...@@ -875,17 +877,16 @@ ...@@ -875,17 +877,16 @@
error_count = res.result.error_count; error_count = res.result.error_count;
}, },
failure: function () { failure: function () {
return; return false;
}, },
error: function () { error: function () {
return; return false;
}, },
scope: this, scope: this,
sync: true sync: true
}); });
//判断起租日 //判断起租日
debugger; if (error_count > 0 && count == 0) {
if (error_count > 0 && count == 0 ) {
count = count + 1; count = count + 1;
$L.showErrorMessage('提示', '变更后起租日期不符合要求，请修改！'); $L.showErrorMessage('提示', '变更后起租日期不符合要求，请修改！');
record.set('column_value',''); record.set('column_value','');
...@@ -901,6 +902,7 @@ ...@@ -901,6 +902,7 @@
} }
} }
onEditorupdate(ds, record, name, value, old_value); onEditorupdate(ds, record, name, value, old_value);
} }
...@@ -1920,6 +1922,7 @@ ...@@ -1920,6 +1922,7 @@
} }
function calc_execute_JD_new(source_procedure) { function calc_execute_JD_new(source_procedure) {
var final_recreate_H_formula, final_recreate_L_formula; var final_recreate_H_formula, final_recreate_L_formula;
if (source_procedure == 'RE_CALC') { if (source_procedure == 'RE_CALC') {
final_recreate_H_formula = 'Y'; final_recreate_H_formula = 'Y';
...@@ -1959,6 +1962,7 @@ ...@@ -1959,6 +1962,7 @@
} }
function calc_execute_NJD_new(source_procedure) { function calc_execute_NJD_new(source_procedure) {
var final_recreate_H_formula, final_recreate_L_formula; var final_recreate_H_formula, final_recreate_L_formula;
if (source_procedure == 'RE_CALC') { if (source_procedure == 'RE_CALC') {
final_recreate_H_formula = 'Y'; final_recreate_H_formula = 'Y';
...@@ -1970,6 +1974,7 @@ ...@@ -1970,6 +1974,7 @@
}else{ }else{
final_recreate_L_formula = recreate_L_formula; final_recreate_L_formula = recreate_L_formula;
} }
} }
Leaf.request({ Leaf.request({
url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update', url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 6b21ef8c
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
return false; return false;
} }
if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){ if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
debugger;
$L.showErrorMessage("提示", '租赁物为北京心诚的业务类型只能是售后回租！'); $L.showErrorMessage("提示", '租赁物为北京心诚的业务类型只能是售后回租！');
return false; return false;
} }
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 6b21ef8c
...@@ -12,11 +12,13 @@ ...@@ -12,11 +12,13 @@
rootPath="user_name_path"/> rootPath="user_name_path"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/> <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
<a:model-query fetchAll="true" model="zjwfl.ZJWFL1060.zi_wfl_approve_get_submitted" rootPath="approve_history_rp"/> <a:model-query fetchAll="true" model="zjwfl.ZJWFL1060.zi_wfl_approve_get_submitted" rootPath="approve_history_rp"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_asset_fee_flag" rootPath="asset_fee_path" ></a:model-query>
<s:server-script import="contract_print_path.js"><![CDATA[ <s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path']; $ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source']; $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
]]>
</s:server-script> $ctx.parameter.asset_fee_flag = $ctx.get('/model/asset_fee_path/record/@asset_fee_flag');
]]></s:server-script>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="${/parameter/@layout_code}lease_number_query_link" <a:link id="${/parameter/@layout_code}lease_number_query_link"
...@@ -114,6 +116,14 @@ ...@@ -114,6 +116,14 @@
}); });
}; };
function check_empty(value){
if(Ext.isEmpty(value)||typeof(value)=='undefined'||value==''||value==null){
return true;
}else{
return false;
}
}
//add by zhuxianfei //add by zhuxianfei
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
...@@ -779,6 +789,18 @@ ...@@ -779,6 +789,18 @@
var billing_url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_bp/query?project_id=${/parameter/@project_id}'; var billing_url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_bp/query?project_id=${/parameter/@project_id}';
$(billing_ds_id).setQueryUrl(billing_url); $(billing_ds_id).setQueryUrl(billing_url);
$(billing_ds_id).query(); $(billing_ds_id).query();
//不为租赁二手机业务时隐藏资管费相关字段及费率 18083 2023/1/15
if('${/parameter/@asset_fee_flag}'=='N'){
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06_prompt').style.display = 'none';
}
//隐藏组件
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
}
}) })
//序号自增 add by lijingjing //序号自增 add by lijingjing
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function (ds, record, config_records, bp_seq) {
...@@ -1136,18 +1158,23 @@ ...@@ -1136,18 +1158,23 @@
} }
} }
if (prj_quotation_ds_id == ds.id && prj_quotation_ds_id){ if (prj_quotation_ds_id == ds.id && prj_quotation_ds_id){
if(division != '70'&& division != ''){ //产品线维护了组合利率的调整加载事件显示
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06')){ if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06').style.display = 'none'; if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_HD_USER_COL_V06_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
} }
}else{
if (check_empty(record.get('hd_user_col_v06'))||record.get('hd_user_col_v06')=='N' ) {
//隐藏组件 //隐藏组件
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){ if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
} }
record.getField('hd_user_col_v06').setRequired(false); }else{
record.getField('asset_id').setRequired(false); //显示组件
record.getField('asset_id_n').setRequired(false); if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'block';
}
}
} }
if(division!='70'&&division!='92'&&division!=''){ if(division!='70'&&division!='92'&&division!=''){
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){ if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
...@@ -1304,26 +1331,21 @@ ...@@ -1304,26 +1331,21 @@
//二手车资管费为否，隐藏组合利率组件及将字段设置为空 //二手车资管费为否，隐藏组合利率组件及将字段设置为空
if (prj_quotation_ds_id == ds.id) { if (prj_quotation_ds_id == ds.id) {
if (name == 'hd_user_col_v06') { if (name == 'hd_user_col_v06') {
if (record.get('hd_user_col_v06') == 'N') { if('${/parameter/@asset_fee_flag}'=='Y'){
record.set('asset_id', null); if (value== 'N'||Ext.isEmpty(value)||value==''||typeof(value) == 'undefined'||value==null) {
record.set('asset_id_n', null);
record.set('btb_int_rate', '');
record.set('int_rate_display', '');
record.getField('asset_id').setRequired(false);
record.getField('asset_id_n').setRequired(false);
//隐藏组件 //隐藏组件
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){ if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
} }
} else { } else {
record.getField('asset_id').setRequired(true);
record.getField('asset_id_n').setRequired(true); //显示组件
//隐藏组件
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){ if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'block'; document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'block';
} }
} }
}
} }
} }
......
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