Skip to content

L
leaf-hlcm
Commit ab907ae2 authored by 38823's avatar 38823
Browse files
Options

付款单发送功能中单据关闭后，需在付款单生成功能中给出特殊标识及提醒

parent b16e7dca
Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 27 deletions
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
View file @ ab907ae2
...@@ -6,8 +6,13 @@ ...@@ -6,8 +6,13 @@
{ {
name : 'approval_date_to', name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')" queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
override(); override();
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
View file @ ab907ae2
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
{ {
name : 'approval_date_to', name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')" queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
View file @ ab907ae2
...@@ -14,8 +14,13 @@ ...@@ -14,8 +14,13 @@
{ {
name : 'collection_classes', name : 'collection_classes',
queryexpression : "collection_classes = ${@collection_classes}" queryexpression : "collection_classes = ${@collection_classes}"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
override(); override();
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ ab907ae2
...@@ -126,6 +126,9 @@ ...@@ -126,6 +126,9 @@
pay_type = 'MANAGE'; pay_type = 'MANAGE';
} }
if(ds_id==req_ln_ds_id){
if(req_ln_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({ new Leaf.Window({
id: 'choose_acount_window', id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(), url: $('pageLink_choose_acount').getUrl(),
...@@ -139,6 +142,91 @@ ...@@ -139,6 +142,91 @@
height: 260, height: 260,
width: 680 width: 680
}); });
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==con_ds_id){
if(con_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==manage_ds_id){
if(manage_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
}; };
//创建强制付款单生成 //创建强制付款单生成
...@@ -196,6 +284,9 @@ ...@@ -196,6 +284,9 @@
pay_type = 'MANAGE'; pay_type = 'MANAGE';
} }
if(ds_id==req_ln_ds_id){
if(req_ln_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({ new Leaf.Window({
id: 'choose_acount_window', id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(), url: $('pageLink_choose_acount').getUrl(),
...@@ -209,6 +300,92 @@ ...@@ -209,6 +300,92 @@
height: 260, height: 260,
width: 680 width: 680
}); });
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==con_ds_id){
if(con_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==manage_ds_id){
if(manage_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
}; };
//创建代付单 //创建代付单
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
...@@ -342,7 +519,52 @@ ...@@ -342,7 +519,52 @@
} }
}; };
//查询时调用(grid,table,gridBox)
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var formr_m_ds_id = '${/parameter/@layout_code}_M_F_QUERY__ds';
var req_ln_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var manage_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'M_RESULT', 'csh_payment_req_ln');
if(form_ds_id && ds.id==req_ln_ds_id){
var form_record = $(form_ds_id).getAt(0);
var if_history = form_record.get('if_history');
}
if(formr_r_ds_id && ds.id==con_ds_id){
var form_r_record = $(formr_r_ds_id).getAt(0);
var r_if_history = form_r_record.get('if_history');
}
if(formr_m_ds_id && ds.id==manage_ds_id){
var form_m_record = $(formr_m_ds_id).getAt(0);
var m_if_history = form_m_record.get('if_history');
}
if(ds.id==req_ln_ds_id && req_ln_ds_id){
if(if_history == 'Y'){
$(req_ln_ds_id).setQueryParameter('if_history','Y');
}else {
$(req_ln_ds_id).setQueryParameter('if_history','N');
}
}
if(ds.id==con_ds_id && con_ds_id){
if(r_if_history == 'Y'){
$(con_ds_id).setQueryParameter('if_history','Y');
}else {
$(con_ds_id).setQueryParameter('if_history','N');
}
}
if(ds.id==manage_ds_id && manage_ds_id){
if(m_if_history == 'Y'){
$(manage_ds_id).setQueryParameter('if_history','Y');
}else {
$(manage_ds_id).setQueryParameter('if_history','N');
}
}
};
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view> </a:view>
</a:screen> </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