Skip to content

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

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

parents 07ccdcac 38f65f56
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 47 deletions
src/main/webapp/WEB-INF/server-script/layoutconfig/csh_asset_fee_asset_grid_queryfields.js 0 → 100644
View file @ 7ee88e56
var override_queryfields = [
{
name:'rent_date_from',
queryexpression:"t1.rent_date between to_date(${@rent_date_from},'yyyy-mm-dd') and nvl(to_date(${@rent_date_to},'yyyy-mm-dd'),t1.rent_date)"
},
{
name:'rent_date_to',
queryexpression:"t1.rent_date between nvl(to_date(${@rent_date_from},'yyyy-mm-dd'),t1.rent_date) and to_date(${@rent_date_to},'yyyy-mm-dd')"
}
];
override();
\ No newline at end of file
src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
View file @ 7ee88e56
......@@ -348,5 +348,6 @@ var enableLayoutConfig = {
'modules/hls/HLS303/bp_asset_create.lview':true,
'modules/csh/CSH1500/csh_asset_reconciliation.lview':true,
'modules/csh/CSH501C/csh_payment_asset_create_entrance.lview':true,
'modules/csh/CSH501C/csh_payment_asset_req.lview':true
'modules/csh/CSH501C/csh_payment_asset_req.lview':true,
'modules/cont/CON1370/con_asset_fee_detail.lview':true
};
\ No newline at end of file
src/main/webapp/modules/cont/CON1370/con_asset_fee.lview 0 → 100644
View file @ 7ee88e56
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 38823
$Date: 2023-01-23
$Revision: 1.0
$purpose: 资产管理费报表
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="csh_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="${/parameter/@layout_code}asset_fee_detail_link"
url="${/request/@context_path}/modules/cont/CON1370/con_asset_fee_detail.lview"/>
<script type="text/javascript"><![CDATA[
function open_asset_fee_detail(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
var param = {};
param['function_code'] = 'CON1370N';
param['function_usage'] = 'QUERY';
param['contract_id'] = record.get('contract_id')
param['maintain_type'] = 'QUERY';
param['url_title'] = '明细';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}asset_fee_detail_link',ds_id);
}
//上传附件
function upload_csh_file(id,record_id) {
debugger;
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if(record_id == "undefined"){
var url = $('csh_downloadFile_id').getUrl();
}else {
url = $('csh_downloadFile_id').getUrl() + '?table_name=CSH_PAYMENT_REQ_ASSET_HD&header_id=' + record_id;
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'csh_attachment_uploadFile_id',
width: 850,
height: 400
});
win.on('close', function () {
//record.ds.query();
});
}
//超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
debugger;
var link_function = '';
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if(name == 'have_payment'){
link_function = 'open_asset_fee_detail';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}
if(name == 'asset_file'){
link_function = 'upload_csh_file';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.get('payment_req_id') + '\')">' + '附件' + '</a>';
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON1370/con_asset_fee_detail.lview 0 → 100644
View file @ 7ee88e56
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 38823
$Date: 2023-01-24
$Revision: 1.0
$purpose: 资产管理费报表明细
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/csh/CSH1500/csh_asset_reconciliation.lview
View file @ 7ee88e56
......@@ -13,10 +13,20 @@
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="asset_check_wfl_link_id"
url="${/request/@context_path}/modules/csh/CSH1500/csh_asset_batch.lsc"/>
<a:link id="${/parameter/@layout_code}con_detail_link"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function() {
if('${/parameter/@function_usage}' == 'QUERY'){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hl_asset_manage_fee');
$(ds_id).setQueryParameter('batch_id','${/parameter/@batch_id}');
$(ds_id).query();
}
});
//提交审批
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hl_asset_manage_fee');
var records = $(ds_id).getSelected();
var ParaData = [];
......@@ -25,9 +35,15 @@
return;
}
for(var i=0; i<records.length;i++){
if(records[i].data.wfl_status == 'APPROVING' || records[i].data.wfl_status == 'APPROVED'){
if(records[i].data.wfl_status_n == 'APPROVING' || records[i].data.wfl_status_n == 'APPROVED'){
$L.showMessage("提示",'请选择新建或者审批拒绝的单据！');
return;;
return;
}
if(i+1<records.length){
if(records[i].data.bp_id_tenant !=records[i+1].data.bp_id_tenant){
$L.showMessage("提示",'请选择相同代理店的现金流进行提交！');
return;
}
}
records[i].set('_status','execute');
ParaData.push(records[i].data);
......@@ -49,6 +65,28 @@
}, null, null);
};
function open_contract_detail(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
var param = {};
param['contract_id'] = record.get('contract_id');
param['function_code'] = 'CON3200Q';
param['layout_code'] = 'CONTRACT_QUERY_INC';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY';
param['url_title'] = '合同起租明细页面';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_detail_link',ds_id);
}
//超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
var link_function = '';
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if(name == 'contract_number'){
link_function = 'open_contract_detail';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/csh/CSH501C/csh_payment_asset_create_entrance.lview
View file @ 7ee88e56
......@@ -21,7 +21,7 @@
param['function_code'] = 'CSH501D_ASSET';
} else {
param['function_usage'] = 'QUERY';
param['function_code'] = 'CSH501D_ASSET';
param['function_code'] = 'ASSET_SAVE';
param['download'] = 'Y';
}
param['winid'] = 'csh_payment_asset_update_window';
......
src/main/webapp/modules/csh/CSH501C/csh_payment_asset_req.lview
View file @ 7ee88e56
......@@ -43,12 +43,12 @@
}
//如果头id 不为空，就使用自在定义的ds进行查询
Leaf.onReady(function () {
if ('${/parameter/@source_type}' == 'WFL') {
if ('${/parameter/@source_type}' == 'WFL'||'${/parameter/@source_type}' == 'WFL_N') {
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var payment_req_id = '${/parameter/@payment_req_id}';
//进项发票信息
var first = document.getElementsByClassName("item-input-wrap");
var second = first[5].getElementsByClassName('item-textField');
......@@ -57,6 +57,31 @@
third.style.backgroundColor = '#FF7744';
});
//form加载
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'], 'csh_payment_req_hd');
if (ds_id == ds.id && ds_id) {
if ('${/parameter/@source_type}' == 'WFL_N') {
record.getField('bp_bank_account_num').setReadOnly(true);
record.getField('bp_bank_account_num_n').setReadOnly(true);
record.getField('req_date').setReadOnly(true);
}
}
}
//grid加载
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lnds_id_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
if(lnds_id_ds_id == ds.id &&lnds_id_ds_id){
//代理店节点只能上传附件，不能编辑
if ('${/parameter/@source_type}' == 'WFL_N') {
record.getField('apply_pay_date').setReadOnly(true);
}
}
}
var dirty_flag = 'N';
window['${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
dirty_flag = 'Y';
......@@ -73,7 +98,7 @@
if((name == 'bp_bank_account_num'||name == 'bp_bank_account_name') && !Ext.isEmpty(hdrecord.get('bp_bank_account_num')) && !Ext.isEmpty(hdrecord.get('bp_bank_account_name'))){
var records = $(lnds_id).getAll();
for (var i = 0; i < records.length; i++) {
records[i].set('bp_bank_account_num', bank_account_num);
records[i].set('bp_bank_account_num', bp_bank_account_num);
records[i].set('bp_bank_full_name', bp_bank_full_name);
records[i].set('bp_bank_account_name', bp_bank_account_name);
records[i].set('bp_bank_account_id', bp_bank_account_id);
......@@ -286,7 +311,7 @@
});
}
//打印
//打印:待确认是否有打印文件，先预留
function csh501_print() {
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
......@@ -326,27 +351,7 @@
check_flag = false;
return;
}
//付给代理店资产管理费总金额
var total_amount_agent = 0;
var total_apply_amount = 0;
var line_datas = $(ds_line_id).data;
var head_record = $(ds_id).getAt(0);
for (var i = 0; i < line_datas.length; i++) {
var line_data = line_datas[i];
//应付我司金额
var amount_agent = get_current_amount(line_data.get('amount_agent'));
var due_amount = get_current_amount(line_data.get('due_amount'));
//本次申请金额等于委托加我司加应付承租人金额
//var this_apply_amount = amount_agent;
total_apply_amount = plus(total_apply_amount, amount_agent);
line_data.set('amount', total_apply_amount);
total_amount_agent = plus(total_amount_agent, amount_agent);
}
//给头表赋值
$(ds_id).getAt(0).set('amount_agent_total', total_amount_agent);
$(ds_id).getAt(0).set('amount', total_apply_amount);
$(ds_id).getAt(0).set('company_id', '${/session/@company_id}');
//确认保存
var hd_record = $(ds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
......@@ -403,12 +408,13 @@
hls_doc_get_layout_code('csh501d_get_layout_code_link_id', param, 'con_rd_wfl_link', '', '${/parameter/@layout_code}');
}
function upload_csh_file(id,name,record_id,item_code) {
//上传附件
function upload_csh_file(id,name,record_id,query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if(record.get('approval_status')=='NEW'){
var url = $('csh_uploadFile_id').getUrl() + '?table_name=CSH_PAYMENT_REQ_ASSET_HD&header_id=' + record_id;
}else{
if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY'){
var url = $('csh_downloadFile_id').getUrl() + '?table_name=CSH_PAYMENT_REQ_ASSET_HD&header_id=' + record_id;
}else{
var url = $('csh_uploadFile_id').getUrl() + '?table_name=CSH_PAYMENT_REQ_ASSET_HD&header_id=' + record_id;
}
var win = new Leaf.Window({
url: url,
......@@ -418,17 +424,40 @@
height: 400
});
win.on('close', function () {
record.ds.query();
//record.ds.query();
});
}
//上传发票附件：用于电子档案
function upload_invoice_file(id,name,record_id,query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY'){
var url = $('csh_downloadFile_id').getUrl() + '?table_name=HL_REQ_PAYMENT_ACP&header_id=' + record_id;
}else{
var url = $('csh_uploadFile_id').getUrl() + '?table_name=HL_REQ_PAYMENT_ACP&header_id=' + record_id;
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'invoice_attachment_uploadFile_id',
width: 850,
height: 400
});
win.on('close', function () {
//record.ds.query();
});
}
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'contract_number'&& value) {
return '<a href="javascript:open_con_contract_readonly_win(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
}else if (name == 'attach_link'){
return '<a href=javascript:upload_csh_file(\''+record.id+'\',\''+ name + '\',\'' +record.get('payment_req_id')+'\',\'' + record.get('item_code')+'\')>附件上传</a>';
return '<a href=javascript:upload_csh_file(\''+record.id+'\',\''+ name + '\',\'' +record.get('payment_req_id')+'\',\'' + config_record.get('query_only')+'\')>附件上传</a>';
}else if (name == 'invoice_link'){
return '<a href=javascript:upload_invoice_file(\''+record.id+'\',\''+ name + '\',\'' +record.get('payment_req_id')+'\',\'' + config_record.get('query_only')+'\')>发票附件上传</a>';
}
};
......
src/main/webapp/modules/hls/HLS303/bp_agent_create.lview
View file @ 7ee88e56
......@@ -352,6 +352,7 @@
var param = {};
param['bp_id'] = record.get('bp_id');
param['agent_division_id'] = record.get('agent_division_id');
param['division'] = record.get('division');
param['function_code'] = 'HLS303_ASSET';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
......
src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
View file @ 7ee88e56
......@@ -302,6 +302,7 @@
var param = {};
param['bp_id'] = record.get('bp_id');
param['agent_division_id'] = record.get('agent_division_id');
param['division'] = record.get('division');
param['function_code'] = 'HLS303_ASSET';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
......
src/main/webapp/modules/hls/HLS303/bp_asset_create.lview
View file @ 7ee88e56
......@@ -56,6 +56,7 @@
line_records[i].set('wfl_status_n','新建');
line_records[i].set('bp_id','${/parameter/@bp_id}');
line_records[i].set('agent_division_id','${/parameter/@agent_division_id}');
line_records[i].set('division','${/parameter/@division}');
}
}
};
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 7ee88e56
......@@ -81,11 +81,19 @@
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{
//新建页面直接隐藏组件
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');
}
}
});
......@@ -98,7 +106,6 @@
}
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
var url;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
......@@ -240,6 +247,12 @@
if(check_empty(int_rate_display)){
int_rate_display=0;
}
if(check_empty(cal_btb_int_rate)){
cal_btb_int_rate =0;
}
if(check_empty(cal_int_rate_display)){
cal_int_rate_display=0;
}
if ((cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='N')
||(cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='Y'&&cal_hd_user_col_v06==hd_user_col_v06
&&cal_btb_int_rate==btb_int_rate&&cal_int_rate_display==int_rate_display)) {
......@@ -831,18 +844,26 @@
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);
record.set('asset_id_n', null);
record.set('btb_int_rate', '');
record.set('int_rate_display', '');
//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')){
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 != '') {
......@@ -1043,13 +1064,17 @@
record.set('asset_id', null);
record.set('asset_id_n', null);
record.set('btb_int_rate', '');
record.set('int_rate_display', '');
//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')){
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);
......@@ -1057,6 +1082,10 @@
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');
}
}
}
}
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 7ee88e56
......@@ -28,6 +28,7 @@
<script type="text/javascript"><![CDATA[
//确定
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var record = $(ds_id).getCurrentRecord();
if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 7ee88e56
......@@ -138,7 +138,6 @@
//add by zhuxianfei
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
var url;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
......@@ -290,6 +289,12 @@
if(check_empty(int_rate_display)){
int_rate_display=0;
}
if(check_empty(cal_btb_int_rate)){
cal_btb_int_rate =0;
}
if(check_empty(cal_int_rate_display)){
cal_int_rate_display=0;
}
if ((cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='N')
||(cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='Y'&&cal_hd_user_col_v06==hd_user_col_v06
&&cal_btb_int_rate==btb_int_rate&&cal_int_rate_display==int_rate_display)) {
......@@ -706,20 +711,28 @@
record.set('asset_id', null);
record.set('asset_id_n', null);
record.set('btb_int_rate', '');
record.set('int_rate_display', '');
//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')){
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);
//隐藏组件
//取消隐藏组件
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');
}
}
}
}
......@@ -1360,18 +1373,27 @@
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);
record.set('asset_id_n', null);
record.set('btb_int_rate', '');
record.set('int_rate_display', '');
//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')){
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);
......@@ -1379,6 +1401,11 @@
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(division!='70'&&division!='92'&&division!=''){
......@@ -1509,6 +1536,10 @@
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');
}
}
});
//序号自增 add by lijingjing
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 7ee88e56
......@@ -656,9 +656,7 @@
if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n');
}
debugger;
if((division=='70'||division=='92')&&division!=''){
debugger;
if((division=='70'||division=='92')&&division!=''){
if(record!=''){
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
......@@ -800,6 +798,14 @@
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_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
}
})
//序号自增 add by lijingjing
......@@ -1163,17 +1169,42 @@
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_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_RE_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' ) {
//隐藏组件
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_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_RE_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 = 'block';
}
if($('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
if( $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
}
}
if(division!='70'&&division!='92'&&division!=''){
......@@ -1338,12 +1369,30 @@
if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
}
} else {
if($('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
}
if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
$('PROJECT_WFL_RE_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 = 'block';
}
if($('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_fee');
}
if($('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('btb_interest');
$('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').showColumn('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