Skip to content

L
leaf-hlcm
Commit c02b0af0 authored by 陆正友's avatar 陆正友
Browse files
Options

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

parents 46b04830 1f83aa42
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 96 deletions
src/main/webapp/WEB-INF/server-script/layoutconfig/contract_query_entrance_g_contract_result_queryfields.js
View file @ c02b0af0
......@@ -124,6 +124,10 @@ var override_queryfields = [
},{
name:'contract_status',
queryexpression:"t1.contract_status=${@contract_status}"
},
{
name:'gua_bp_name',
queryexpression:"exists(select 1 from con_contract_bp bp where bp.contract_id=t1.contract_id and bp.bp_category='GUARANTOR' and bp.bp_name like '%'||${@gua_bp_name}||'%')\n"
}
];
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ c02b0af0
......@@ -232,7 +232,7 @@
//add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
//调整后资金占用费
if(name == 'fund_possession_cost'&& clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) {
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
setTimeout(function () {
record.set('fund_possession_cost', 0);
......@@ -244,6 +244,17 @@
var et_due_amount_result = plus(sum_unreceived_principal, value);
record.set('et_due_amount', et_due_amount_result);
}
//调整资金占用费 18083 2023/2/6
var fund_possession_time = record.get('fund_possession_time')||0;
var btb_int_rate = record.get('btb_int_rate')||0;
var asset_possession_cost_result =value-sum_unreceived_principal*fund_possession_time*btb_int_rate/360;
if(asset_possession_cost_result<0|| asset_possession_cost_result == NaN || asset_possession_cost_result == undefined) {
record.set('asset_possession_cost', 0);
}else{
record.set('asset_possession_cost', asset_possession_cost_result);
}
}
if(name == 'residual_value'&& clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) {
......
src/main/webapp/modules/csh/CSH501C/csh_payment_asset_create_entrance.lview
View file @ c02b0af0
......@@ -16,10 +16,15 @@
param['payment_req_id'] = record.get('payment_req_id');
param['bp_id'] = record.get('bp_id_agent_level1');
param['business_type'] = record.get('business_type');
param['approval_status'] = record.get('approval_status');
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D_ASSET';
} else {
} else if(record.get('approval_status') == 'APPROVED'){
param['function_usage'] = 'QUERY';
param['function_code'] = 'CSH501D_ASSET';
param['download'] = 'Y';
} else{
param['function_usage'] = 'QUERY';
param['function_code'] = 'ASSET_SAVE';
param['download'] = 'Y';
......
src/main/webapp/modules/csh/CSH501C/csh_payment_asset_req.lview
View file @ c02b0af0
......@@ -47,6 +47,17 @@
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
if('${/parameter/@approval_status}' == 'APPROVED'){
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
if(document.getElementById('${/parameter/@layout_code}_exit')){
document.getElementById('${/parameter/@layout_code}_exit').style.display = "none";
}
if(document.getElementById('${/parameter/@layout_code}_submit_approval')){
document.getElementById('${/parameter/@layout_code}_submit_approval').style.display = "none";
}
}
//进项发票信息
var first = document.getElementsByClassName("item-input-wrap");
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ c02b0af0
......@@ -544,15 +544,19 @@
para: datas,
success: function(res) {
Leaf.Masker.unmask(Ext.getBody());
if(res.result.record[0].p_err_msg){
var message='';
for(var i=0;i<res.result.record.length;i++){
var err_sum =0;
var message='';
for(var i=0;i<res.result.record.length;i++){
if(res.result.record[i].p_err_msg !=undefined){
message= res.result.record[i].p_err_msg + message;
var e_message = '建行代扣结果未回传 ：'+message+',请重新选择需核销的现金流!';
err_sum = err_sum +1;
}
var e_message = '建行代扣结果未回传 ：'+message+',请重新选择需核销的现金流!';
}
if(err_sum > 0){
$L.showErrorMessage("提示",e_message,null,800,300);
$('csh531n_write_off_submit_btn_id').enable();
}else {
} else {
Leaf.Masker.unmask(Ext.getBody());
$('csh_transaction_deposit_ds').submit();
$('csh_transaction_advanced_ds').submit();
......
src/main/webapp/modules/hls/HLS303/bp_asset_create.lview
View file @ c02b0af0
......@@ -31,6 +31,16 @@
if(document.getElementById('${/parameter/@layout_code}_submit_approval')){
$jq('#${/parameter/@layout_code}_submit_approval').hide();
}
//uat环境设置query只会不能对grid按钮隐藏处理
if($jq('#${/parameter/@layout_code}_ASSET_FEE_ADD_layout_dynamic_button_id')){
$jq('#${/parameter/@layout_code}_ASSET_FEE_ADD_layout_dynamic_button_id').hide();
}
if($jq('#${/parameter/@layout_code}_ASSET_FEE_SAVE_layout_dynamic_button_id')){
$jq('#${/parameter/@layout_code}_ASSET_FEE_SAVE_layout_dynamic_button_id').hide();
}
if($jq('#${/parameter/@layout_code}_ASSET_FEE_USER_BUTTON1_layout_dynamic_button_id')){
$jq('#${/parameter/@layout_code}_ASSET_FEE_USER_BUTTON1_layout_dynamic_button_id').hide();
}
}
});
//加载时调用(grid,table,gridBox)
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ c02b0af0
......@@ -81,18 +81,18 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
//新建页面直接隐藏组件
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}
});
......@@ -844,10 +844,7 @@
record.getField('hd_user_col_v06_n').setRequired(false);
record.getField('asset_id').setRequired(false);
record.getField('asset_id_n').setRequired(false);
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if (check_empty(record.get('hd_user_col_v06'))||record.get('hd_user_col_v06')=='N' ) {
record.set('asset_id', null);
......@@ -860,10 +857,7 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}
}
if (division != '70'&&division!='92' && division != '') {
......@@ -1071,9 +1065,9 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
} else {
record.getField('asset_id').setRequired(true);
......@@ -1082,9 +1076,9 @@
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($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
......@@ -1409,6 +1403,9 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
//控制资管费现金流隐藏
var cashflow_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CASHFLOW_NS', 'prj_quotation');
if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'&& division!='99'){
......@@ -1442,6 +1439,30 @@
record.getField('bp_id_n').setReadOnly(true);
}
}
//现金流列表加载时隐藏资管费 18083
if(cashflow_ds_id == ds.id &&cashflow_ds_id){
var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if (check_empty(hd_user_col_v06)||hd_user_col_v06=='N' ) {
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
}
};
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ c02b0af0
......@@ -30,7 +30,7 @@
<a:link id="prj501N_prj_lease_item_maintain_link" model="prj.PRJ500N.prj_project_lease_item_delete" modelaction="execute"/>
<a:link id="hls_bp_master_billing_link" model="prj.PRJ500N.hls_bp_master_billing" modelaction="query"/>
<a:link id="bp_tenant_detail_query_link" model="prj.PRJ500D.bp_tenant_old_r_query" modelaction="query"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}get_special_fields_link_id"
<a:link id="${/parameter/@pre_layout}get_special_fields_link_id"
model="cont.CON500.con_contract_get_special_fields" modelaction="update"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
url="${/request/@context_path}/uploadFile.lview"/>
......@@ -718,9 +718,9 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
} else {
record.getField('asset_id').setRequired(true);
......@@ -729,9 +729,9 @@
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($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
......@@ -1087,6 +1087,8 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
//控制资管费现金流隐藏
var cashflow_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CASHFLOW_NS', 'prj_quotation');
/* var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_HISTORY_INFO_1', 'prj_project_bp');
$(bp_ds_ids).setQueryParameter('bp_id','${/parameter/@bp_id_tenant}');
......@@ -1152,6 +1154,30 @@
record.getField('bp_id_n').setReadOnly(true);
}
}
//现金流列表加载时隐藏资管费 18083
if(cashflow_ds_id == ds.id &&cashflow_ds_id){
var hd_user_col_v06 = $(cashflow_ds_id).getAt(0).get('hd_user_col_v06');
if('${/parameter/@asset_fee_flag}'=='N'||'${/parameter/@asset_fee_flag}'==''){
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if (check_empty(hd_user_col_v06)||hd_user_col_v06=='N' ) {
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
}
};
......@@ -1166,8 +1192,7 @@
}
var division='';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
if(tenant_ds_id == ds.id){
if (Leaf.isEmpty(record.get('send_message'))){
......@@ -1373,10 +1398,7 @@
record.getField('hd_user_col_v06_n').setRequired(false);
record.getField('asset_id').setRequired(false);
record.getField('asset_id_n').setRequired(false);
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
if (check_empty(record.get('hd_user_col_v06'))||record.get('hd_user_col_v06')=='N' ) {
......@@ -1390,10 +1412,7 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}else{
record.getField('asset_id').setRequired(true);
record.getField('asset_id_n').setRequired(true);
......@@ -1401,10 +1420,6 @@
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($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
......@@ -1536,9 +1551,9 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
if($('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_CREATE_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
if($('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('${/parameter/@layout_code}_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}
});
......
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