From 026becffb7a4ee84407d58e6cf724ec26084fb1a Mon Sep 17 00:00:00 2001
From: 38823 <fan@4948560>
Date: Fri, 22 Nov 2024 09:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E5=8F=91=E9=80=81?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=AD=E5=8D=95=E6=8D=AE=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=9C=80=E5=9C=A8=E4=BB=98=E6=AC=BE=E5=8D=95?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=BB=99=E5=87=BA?=
=?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=A0=87=E8=AF=86=E5=8F=8A=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hsbc100_g_result_queryfields.js | 5 +
.../hsbc100_m_result_queryfields.js | 4 +
.../hsbc100_r_result_queryfields.js | 5 +
.../HSBC100/hsbc_paying_batch_create.lview | 276 ++++++++++++++++--
4 files changed, 263 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
index 6827b14c..f31d88e7 100644
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
@@ -6,8 +6,13 @@
{
name : 'approval_date_to',
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();
diff --git a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
index 6827b14c..eb34bc3b 100644
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
@@ -6,6 +6,10 @@
{
name : 'approval_date_to',
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)))"
}
];
diff --git a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
index 51e93625..d7d0c970 100644
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
@@ -14,8 +14,13 @@
{
name : '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();
diff --git a/src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview b/src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
index 1cda614c..dd5cf8bd 100644
--- a/src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
+++ b/src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
@@ -126,19 +126,107 @@
pay_type = 'MANAGE';
}
- 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==req_ln_ds_id){
+ if(req_ln_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==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,19 +284,108 @@
pay_type = 'MANAGE';
}
- 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==req_ln_ds_id){
+ if(req_ln_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==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() {
@@ -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>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
-</a:screen>
\ No newline at end of file
+</a:screen>
+
--
2.21.0