Commit 701228f1 authored by 18083's avatar 18083

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

parents ea45a3f8 7ba4c2a8
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 38823
$Date: 2022-01-15
$Revision: 1
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="asset_batch_id" output="true" outputPath="@asset_batch_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
declare
v_asset_batch_id asset_management_fee_batch.asset_batch_id%TYPE := asset_management_fee_batch_s.nextval;
begin
${@asset_batch_id} := v_asset_batch_id;
insert into asset_management_fee_batch
(asset_batch_id,
instance_id,
wfl_status,
created_by,
creation_date,
last_updated_by,
last_update_date)
values
(v_asset_batch_id,
null,
null,
${/session/@user_id},
sysdate,
${/session/@user_id},
sysdate
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
update asset_management_fee amf
set amf.asset_batch_id =${/parameter/@asset_batch_id},
amf.last_updated_by = ${/session/@user_id},
amf.last_update_date = sysdate
where amf.asset_id = ${@asset_id}
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
asset_management_fee_wfl_pkg.asset_wfl_start(p_asset_batch_id =>${/parameter/@asset_batch_id},
p_user_id =>${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
var add_datafilters=[
{
name:'bp_id',
expression:"(t1.bp_id=${/parameter/@bp_id})"
}
];
add_datafilter();
\ No newline at end of file
...@@ -344,5 +344,6 @@ var enableLayoutConfig = { ...@@ -344,5 +344,6 @@ var enableLayoutConfig = {
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview':true, 'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview':true,
'modules/inv/INV100/inv_payment_wfl.lview':true, 'modules/inv/INV100/inv_payment_wfl.lview':true,
'modules/inv/INV100/inv_payment_detail.lview':true, 'modules/inv/INV100/inv_payment_detail.lview':true,
'modules/inv/INV100/inv_payment_wfl_detail.lview':true 'modules/inv/INV100/inv_payment_wfl_detail.lview':true,
'modules/hls/HLS303/bp_asset_create.lview':true
}; };
\ No newline at end of file
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="bp_agent_import_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_import.lview"/> <a:link id="bp_agent_import_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_import.lview"/>
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="${/parameter/@layout_code}asset_management_link"
url="${/request/@context_path}/modules/hls/HLS303/bp_asset_create.lview"/>
<a:link id="import_upload_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_import_upload.lview"/> <a:link id="import_upload_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_import_upload.lview"/>
<!--<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/>--> <!--<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/>-->
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/> <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
...@@ -216,6 +219,26 @@ ...@@ -216,6 +219,26 @@
} }
} }
} }
//租赁物信息删除
window['${/parameter/@layout_code}_G_DIVISION_USER_BUTTON1_layout_dynamic_tab_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
Leaf.showConfirm('提示', '是否确认删除', function() {
debugger;
var records = $(ds_id).getSelected();
if(records.length ==0){
$L.showMessage('提示','请至少选择一条数据!');
return;
}
for(var i=0;i<records.length;i++){
if(records[i].data.asset_sum>0){
$L.showMessage('提示','该产品线项下存在审批中/审批通过的利率组合,不允许删除!');
return;
}
$(ds_id).remove(records[i]);
}
});
};
//财务报表导入 //财务报表导入
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
...@@ -318,12 +341,31 @@ ...@@ -318,12 +341,31 @@
} }
} }
//资产管理费
function open_asset_management(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
if(record.get('bp_id') == undefined){
$L.showMessage('提示','请先保存!');
return;
}
var param = {};
param['bp_id'] = record.get('bp_id');
param['agent_division_id'] = record.get('agent_division_id');
param['function_code'] = 'HLS303_ASSET';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['winid'] = 'open_asset_create_window';
param['url_title'] = '资产管理费明细页面';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}asset_management_link',ds_id);
}
//超链接渲染 //超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) { window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
debugger;
// //
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record; window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'attachment') { if (name == 'attachment') {
...@@ -368,6 +410,9 @@ ...@@ -368,6 +410,9 @@
} else { } else {
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '(' + record.get('attach_count') + ')' + '</a>'; return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '(' + record.get('attach_count') + ')' + '</a>';
} }
}else if(name == 'management_flag'){
link_function = 'open_asset_management';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.ds.id + '\')">' + '明细' + '</a>';
} }
}; };
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" dynamiccreateenabled="true" trace="true">
<a:view> <a:view>
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id"
model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="prj500_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="prj500_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="prj500_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="prj500_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="asset_management_link_id"
url="${/request/@context_path}/modules/hls/HLS303/bp_asset_create.lview"/>
<a:link id="hls303_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/> <a:link id="hls303_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
<a:link id="hls303_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/> <a:link id="hls303_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/> <script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/>
...@@ -291,6 +291,24 @@ ...@@ -291,6 +291,24 @@
} }
//资产管理费
function open_asset_management(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id);
if(record.get('bp_id') == 'undefined'){
$L.showMessage('提示','请先保存!');
return;
}
var param = {};
param['bp_id'] = record.get('bp_id');
param['agent_division_id'] = record.get('agent_division_id');
param['function_code'] = 'HLS303_ASSET';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['winid'] = 'open_asset_create_window';
param['url_title'] = '资产管理费明细页面';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'asset_management_link_id',ds_id);
}
//保存submitsuccess调用 //保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) { window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) {
...@@ -387,6 +405,27 @@ ...@@ -387,6 +405,27 @@
$(ds_id).remove(); $(ds_id).remove();
}; };
//租赁物信息删除
window['${/parameter/@layout_code}_G_DIVISION_USER_BUTTON1_layout_dynamic_tab_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
Leaf.showConfirm('提示', '是否确认删除', function() {
debugger;
var records = $(ds_id).getSelected();
if(records.length ==0){
$L.showMessage('提示','请至少选择一条数据!');
return;
}
for(var i=0;i<records.length;i++){
if(records[i].data.asset_sum>0){
$L.showMessage('提示','该产品线项下存在审批中/审批通过的利率组合,不允许删除!');
return;
}
$(ds_id).remove(records[i]);
}
});
};
//超链接渲染 //超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
...@@ -421,6 +460,9 @@ ...@@ -421,6 +460,9 @@
return url; return url;
} }
}else if(name == 'management_flag'){
link_function = 'open_asset_management';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + record.ds.id + '\')">' + '明细' + '</a>';
} }
}; };
......
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<p:echo></p:echo>
<a:model-insert model="hls.HLS303.asset_wfl_approval" trace="true"/>
<a:batch-apply sourcepath="/parameter">
<a:model-update model="hls.HLS303.asset_wfl_approval" trace="true"/>
</a:batch-apply>
<a:model-execute model="hls.HLS303.asset_wfl_approval" trace="true"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 38823
$Date: 2023-01-09
$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="asset_wfl_link_id"
url="${/request/@context_path}/modules/hls/HLS303/bp_asset_batch.lsc"/>
<script type="text/javascript"><![CDATA[
$L.onReady(function(){
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'asset_management_fee');
$(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
$(ds_id).query();
});
//加载时调用(grid,table,gridBox)
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'asset_management_fee');
if(ds_id){
var record = $(ds_id).getAll();
for(var i=0;i<record.length;i++){
if(record[i].get('wfl_status') != 'NEW'){
record[i].getField('group_rate').setReadOnly(true);
record[i].getField('internal_rate').setReadOnly(true);
record[i].getField('external_rate').setReadOnly(true);
}
}
}
};
//新增时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
var line_records = ds.getAll();
for (var i = 0;i < line_records.length;i++) {
if(line_records[i].get('asset_id') == undefined){
line_records[i].set('wfl_status','NEW');
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}');
}
}
};
//提交审批
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'asset_management_fee');
var records = $(ds_id).getSelected();
var ParaData = [];
if(records.length ==0){
$L.showMessage("提示",'请至少选择一条数据!');
return;
}
for(var i=0; i<records.length;i++){
if(records[i].data.wfl_status == 'APPROVING' || records[i].data.wfl_status == 'APPROVED'){
$L.showMessage("提示",'请选择新建或者审批拒绝的单据!');
return;;
}
records[i].set('_status','execute');
ParaData.push(records[i].data);
}
Leaf.showConfirm('${l:PROMPT}', '确认提交资产管理费工作流?', function () {
Leaf.request({
url: $('asset_wfl_link_id').getUrl(),
para: ParaData,
success: function () {
Leaf.SideBar.show({
msg: '提交成功',
duration: 2000
});
$(ds_id).query();
},
scope: this
});
}, function () {
}, null, null);
};
//删除
window['${/parameter/@layout_code}_ASSET_FEE_USER_BUTTON1_layout_dynamic_tab_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'asset_management_fee');
Leaf.showConfirm('提示', '是否确认删除', function() {
var records = $(ds_id).getSelected();
if(records.length ==0){
$L.showMessage('提示','请至少选择一条数据!');
return;
}
for(var i=0;i<records.length;i++){
if(records[i].data.wfl_status =='APPROVED' || records[i].data.wfl_status =='APPROVING'){
$L.showMessage('提示','请选择新建/审批拒绝的单据进行删除!');
return;
}
$(ds_id).remove(records[i]);
}
});
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
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