Skip to content

L
leaf-hlcm
Commit c5992a6f authored by Luochenglong's avatar Luochenglong
Browse files
Options

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

parents ad793e76 12350d70
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 26 deletions
src/main/webapp/WEB-INF/classes/csh/CSH515/get_current_seq.lwm 0 → 100644
View file @ c5992a6f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: Feng
$Date: 2013-9-24 下午2:19:04
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT (select count(1)
from exp_org_position_vl ep, exp_employee_assigns ea
where ea.employee_id = t.employee_id
and ea.position_id = ep.POSITION_ID
and ep.POSITION_CODE = '012') position_012_flag,
(select zi.current_seq
from zj_wfl_workflow_instance zi, csh_transaction_return cr
where zi.instance_id = cr.wfl_instance_id
and cr.return_id =${/parameter/@return_id}) current_seq
FROM sys_user t
where t.user_id = ${/session/@user_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH515/new_csh_transaction_receipt_return_query.lwm
View file @ c5992a6f
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<bm:field name="acc_confirmed_by"/> <bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/> <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/> <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from csh_write_off cw, hls_journal_header h where cw.write_off_type = 'REFUND_ENTRY' and cw.csh_transaction_id = h.source_id and h.source_table = 'CSH_TRANSACTION' and t1.source_doc_type = cw.write_off_type and t1.source_doc_id = cw.write_off_id and exists (select 1 from hls_journal_detail d where h.journal_header_id = d.journal_header_id and cw.write_off_id = d.cashflow_id))"/> <bm:field name="receipt_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from csh_write_off cw, hls_journal_header h where cw.write_off_type in ('REFUND_ENTRY','RECEIPT_ADVANCE_RECEIPT') and cw.csh_transaction_id = h.source_id and h.source_table = 'CSH_TRANSACTION' and t1.source_doc_type = cw.write_off_type and t1.source_doc_id = cw.write_off_id and exists (select 1 from hls_journal_detail d where h.journal_header_id = d.journal_header_id and cw.write_off_id = d.cashflow_id))"/>
<bm:field name="return_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from hls_journal_header h,csh_transaction ct where h.source_table = 'CSH_TRANSACTION' and h.source_id = ct.transaction_id and ct.return_from_csh_trx_id = t1.transaction_id and ct.returned_flag = 'RETURN')"/> <bm:field name="return_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from hls_journal_header h,csh_transaction ct where h.source_table = 'CSH_TRANSACTION' and h.source_id = ct.transaction_id and ct.return_from_csh_trx_id = t1.transaction_id and ct.returned_flag = 'RETURN')"/>
<bm:field name="tenant_account_id" forInsert="false" forUpdate="false" expression="(select cc.bank_account_id from con_contract cc where cc.contract_id = t1.ref_contract_id)"/> <bm:field name="tenant_account_id" forInsert="false" forUpdate="false" expression="(select cc.bank_account_id from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="tenant_account_num" forInsert="false" forUpdate="false" expression="(select ha.bank_account_num from con_contract cc,hls_bp_master_bank_account ha where cc.contract_id = t1.ref_contract_id and ha.bank_account_id = cc.bank_account_id)"/> <bm:field name="tenant_account_num" forInsert="false" forUpdate="false" expression="(select ha.bank_account_num from con_contract cc,hls_bp_master_bank_account ha where cc.contract_id = t1.ref_contract_id and ha.bank_account_id = cc.bank_account_id)"/>
...@@ -117,9 +117,10 @@ ...@@ -117,9 +117,10 @@
</bm:primary-key> </bm:primary-key>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" expression="(t1.transaction_category='BUSINESS')"/> <bm:data-filter name="query" expression="(t1.transaction_category='BUSINESS')"/>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and returned_flag not in ( &apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;=t1.transaction_amount)) "/> <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and returned_flag not in ( &apos;RETURN&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;=t1.transaction_amount)) "/>
<!-- <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>--> <!-- <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>-->
<bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;))"/> <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;))"/>
<bm:data-filter name="query" expression="((t1.transaction_type = &apos;ADVANCE_RECEIPT&apos;) or ((t1.transaction_type =&apos;RECEIPT&apos;) and t1.collection_classes = &apos;REFUND&apos; and t1.source_csh_trx_id is not null))"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/> <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm
View file @ c5992a6f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF_INTERFACE" defaultOrderBy="contract_number asc,write_off_times asc,write_off_cf_item asc"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF_INTERFACE" defaultOrderBy="write_off_interface_id">
<bm:operations> <bm:operations>
<bm:operation name="delete"> <bm:operation name="delete">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ c5992a6f
...@@ -135,6 +135,7 @@ ...@@ -135,6 +135,7 @@
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/> <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/> <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>
<bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/> <bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>
<bm:data-filter name="query" expression="(t1.returned_flag not in ('RETURN'))"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/> <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_query.lwm
View file @ c5992a6f
...@@ -55,13 +55,26 @@ ...@@ -55,13 +55,26 @@
(select a.bp_name (select a.bp_name
from hls_bp_master a from hls_bp_master a
where a.bp_id = ct.bp_id) bp_agent_name, where a.bp_id = ct.bp_id) bp_agent_name,
nvl(cr.left_amount, 0) as left_amount nvl(cr.left_amount, 0) as left_amount,
cr.finance_flag,
--cr.left_amount - cr.return_amount remain_amount,
(nvl(ct.transaction_amount,0)-nvl(ct.write_off_amount,0)-nvl(ct.returned_amount,0)) -cr.return_amount remain_amount,
cr.bp_bank_branch_name
from csh_transaction ct, csh_transaction_return cr from csh_transaction ct, csh_transaction_return cr
where ct.transaction_id = cr.transaction_id where ct.transaction_id = cr.transaction_id
) v ) v
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
update csh_transaction_return cr
set cr.finance_flag = ${@finance_flag}
where cr.return_id = ${@return_id};
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="return_id" queryExpression="v.return_id=${@return_id}"/> <bm:query-field name="return_id" queryExpression="v.return_id=${@return_id}"/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/hls_bp_master_bank_account_lov.lwm 0 → 100644
View file @ c5992a6f
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false" >
<bm:fields>
<bm:field name="bp_id"/>
<bm:field name="return_bp_type"/>
<bm:field name="return_bp_type_n" displayWidth="80" forDisplay="true" forQuery="true" prompt="对方类型"/>
<bm:field name="bp_code" displayWidth="80" forDisplay="true" forQuery="true" prompt="商业伙伴编号"/>
<bm:field name="bp_name" displayWidth="160" forDisplay="true" forQuery="true" prompt="HLS.BP_NAME"/>
<bm:field name="bank_account_name" displayWidth="130" forDisplay="true" prompt="对方账户户名"/>
<bm:field name="bank_account_num" displayWidth="130" forDisplay="true" prompt="对方账户账号"/>
<bm:field name="bank_full_name" displayWidth="130" forDisplay="true" prompt="对方银行名称"/>
<bm:field name="bank_branch_name" displayWidth="130" forDisplay="true" prompt="对方分行名称"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from ( select hb.bp_id,
hb.bp_code,
hb.bp_name,
hb.bp_category return_bp_type,
(select hc.description
from hls_bp_category hc
where hc.bp_category = hb.bp_category) return_bp_type_n,
ha.bank_account_name ,
ha.bank_account_num ,
ha.bank_full_name ,
ha.bank_branch_name
from hls_bp_master_bank_account ha, hls_bp_master hb
where ha.bp_id(+) = hb.bp_id
and ha.enabled_flag(+) = 'Y'
and hb.enabled_flag = 'Y'
and hb.bp_category in ('TENANT', 'AGENT', 'THIRD_PARTY'))t #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<!-- <bm:data-filters>-->
<!-- <bm:data-filter name="query" expression="t.return_id = ${@return_id}"/>-->
<!-- </bm:data-filters>-->
<bm:query-fields>
<bm:query-field field="return_bp_type_n" queryOperator="="/>
<bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field field="bp_code" queryOperator="like"/>
<bm:query-field field="bp_name" queryExpression="t.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/return_workflow_start.lwm
View file @ c5992a6f
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
p_bp_bank_account_name =>${@bp_bank_account_name}, p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na}, p_opposite_band_na =>${@opposite_band_na},
p_bp_bank_account_num =>${@bp_bank_account_num}, p_bp_bank_account_num =>${@bp_bank_account_num},
p_bp_bank_branch_name =>${@bp_bank_branch_name},
p_description =>${@description}, p_description =>${@description},
p_csh_return_atm_id =>${@csh_return_atm_id}, p_csh_return_atm_id =>${@csh_return_atm_id},
p_csh_return_bp_id =>${@csh_return_bp_id}, p_csh_return_bp_id =>${@csh_return_bp_id},
......
src/main/webapp/WEB-INF/classes/hls/HLS536/submit_hls_journal_tmp.lwm
View file @ c5992a6f
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<bm:update-sql> <bm:update-sql>
<![CDATA[ <![CDATA[
update hls_journal_header_imp hjhi update hls_journal_header_imp hjhi
set hjhi.wfl_status = 'APPROVING', set
hjhi.journal_submit_batch_id = ${/parameter/@journal_submit_batch_id}, hjhi.journal_submit_batch_id = ${/parameter/@journal_submit_batch_id},
hjhi.last_updated_by = ${/session/@user_id}, hjhi.last_updated_by = ${/session/@user_id},
hjhi.last_update_date = sysdate hjhi.last_update_date = sysdate
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
View file @ c5992a6f
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,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 : 'collection_classes',
queryexpression : "collection_classes = ${@collection_classes}"
} }
]; ];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_r_result_queryfields.js
View file @ c5992a6f
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
var add_datafilters = [ var add_datafilters = [
{ {
name : 'init_filter', name : 'init_filter',
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.collection_classes = 'REFUND'" //expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.collection_classes = 'REFUND'"
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and nvl(t1.cf_item,'-1') <> '0'"
} }
]; ];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc120_g_result_queryfields.js
View file @ c5992a6f
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
{ {
name : 'hsbc_status', name : 'hsbc_status',
queryexpression : "t1.status = ${@hsbc_status}" queryexpression : "t1.status = ${@hsbc_status}"
},
{
name : 'inacctname',
queryexpression : "exists (select 1 from hl_hsbc_paying_doc_lv hd where t1.batch_id = hd.batch_id and hd.inacctname like ${@inacctname})"
} }
]; ];
......
src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
View file @ c5992a6f
...@@ -239,10 +239,21 @@ ...@@ -239,10 +239,21 @@
//20220412新增校验 //20220412新增校验
var collection_classes = record.get('collection_classes'); var collection_classes = record.get('collection_classes');
var source_csh_trx_id = record.get('source_csh_trx_id'); var source_csh_trx_id = record.get('source_csh_trx_id');
if (collection_classes != 'REFUND' || Ext.isEmpty(source_csh_trx_id)){ // if (collection_classes != 'REFUND' || Ext.isEmpty(source_csh_trx_id)){
Leaf.showMessage('提示','该功能只适用日立返还金退款'); // Leaf.showMessage('提示','该功能只适用日立返还金退款');
return; // return;
} // }
// 20221121 非保证金、混合类收款 也能退款 暂时用限制条件限制展示数据
// if (collection_classes == 'REFUND' && Ext.isEmpty(source_csh_trx_id)){
// Leaf.showMessage('提示','用日立返还金只能入账后退款');
// return;
// }
// var transaction_type = record.get('transaction_type');
// if (transaction_type == 'RECEIPT' && (collection_classes !='REFUND' || Ext.isEmpty(collection_classes))){
// Leaf.showMessage('提示','收款必须先转为预收款在进行退款');
// return;
// }
Leaf.request({ Leaf.request({
url: $('csh560_check_wfl_link').getUrl(), url: $('csh560_check_wfl_link').getUrl(),
para: { para: {
......
src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview
View file @ c5992a6f
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure> <a:init-procedure>
<a:model-query fetchAll="true" model="csh.CSH560.get_fin_amount" rootPath="fin_amount_check"/> <a:model-query fetchAll="true" model="csh.CSH560.get_fin_amount" rootPath="fin_amount_check"/>
<a:model-query model="csh.CSH515.get_sys_post" rootPath="post_info"/> <a:model-query model="csh.CSH515.get_sys_post" rootPath="post_info"/>
<a:model-query model="csh.CSH515.get_current_seq" rootPath="seq_info"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh560_start_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="execute"/> <a:link id="csh560_start_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="execute"/>
...@@ -49,10 +50,18 @@ ...@@ -49,10 +50,18 @@
// 设定第一个input组件background的color // 设定第一个input组件background的color
req_change_input_1[0].style.setProperty('background-color','#ff8465','important'); req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
}; };
if("${/model/post_info/record/@position_code}"!="012") { // if("${/model/post_info/record/@position_code}"!="012") {
// document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG_prompt").style.display = "none";
// document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG").style.display = "none";
// }
if("${/model/seq_info/record/@position_012_flag}"== 0 && "${/model/seq_info/record/@current_seq}" < 15) {
document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG_prompt").style.display = "none"; document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG_prompt").style.display = "none";
document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG").style.display = "none"; document.getElementById("CSH_TRANCTION_RETURN_F_FORM_CSH_TRANSACTION_RETURN_FINANCE_FLAG").style.display = "none";
} }
if("${/model/seq_info/record/@current_seq}" > 15) {
record.set('finance_flag', 'Y');
record.getField('finance_flag').setReadOnly(true);
}
if("${/model/post_info/record/@position_code}"=="012") { if("${/model/post_info/record/@position_code}"=="012") {
record.getField('this_return_amount').setReadOnly(true); record.getField('this_return_amount').setReadOnly(true);
record.getField('return_date').setReadOnly(true); record.getField('return_date').setReadOnly(true);
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
View file @ c5992a6f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
modelaction="update"/> modelaction="update"/>
<a:link id="csh560_start_wfl_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start" <a:link id="csh560_start_wfl_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start"
modelaction="execute"/> modelaction="execute"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
var csh_return_atm_id = '${/model/csh_return_list_id/record/@return_list_id}'; var csh_return_atm_id = '${/model/csh_return_list_id/record/@return_list_id}';
...@@ -61,6 +62,14 @@ ...@@ -61,6 +62,14 @@
var transaction_id = $('csh_transaction_receipt_return_maintain_ds').getCurrentRecord().get('transaction_id'); var transaction_id = $('csh_transaction_receipt_return_maintain_ds').getCurrentRecord().get('transaction_id');
var unwrite_off_amount = $('csh_transaction_receipt_return_maintain_ds').getCurrentRecord().get('unwrite_off_amount'); var unwrite_off_amount = $('csh_transaction_receipt_return_maintain_ds').getCurrentRecord().get('unwrite_off_amount');
var return_id = record.get('return_id'); var return_id = record.get('return_id');
var band_na = record.get('opposite_band_na');
var bank_branch_name = record.get('bp_bank_branch_name');
if(bank_branch_name.indexOf(band_na)==-1){
Leaf.showMessage('提示', '请填写支行全称(例如：上海浦东发展银行外高桥保税区支行)');
return false;
}
// if (record.validateRecord()){ // if (record.validateRecord()){
if ($('csh_transaction_deposit_return_maintain_ds').validate()) { if ($('csh_transaction_deposit_return_maintain_ds').validate()) {
// Leaf.Masker.mask(Ext.getBody()); // Leaf.Masker.mask(Ext.getBody());
...@@ -80,6 +89,7 @@ ...@@ -80,6 +89,7 @@
bp_bank_account_name: record.get('bp_bank_account_name'), bp_bank_account_name: record.get('bp_bank_account_name'),
opposite_band_na: record.get('opposite_band_na'), opposite_band_na: record.get('opposite_band_na'),
bp_bank_account_num: record.get('bp_bank_account_num'), bp_bank_account_num: record.get('bp_bank_account_num'),
bp_bank_branch_name: record.get('bp_bank_branch_name'),
description: record.get('description'), description: record.get('description'),
csh_return_atm_id: csh_return_atm_id, csh_return_atm_id: csh_return_atm_id,
csh_return_bp_id: record.get('csh_return_bp_id'), csh_return_bp_id: record.get('csh_return_bp_id'),
...@@ -136,7 +146,7 @@ ...@@ -136,7 +146,7 @@
url: $('cus_deposit1060_upload_win_link').getUrl(), url: $('cus_deposit1060_upload_win_link').getUrl(),
params: { params: {
winid: 'hn2050_upload_win', winid: 'hn2050_upload_win',
table_name: 'CSH_TRANSACTION_RETURN', table_name: 'CSH_TRANSACTION_RETURN_DEPOSIT',
header_id: csh_return_atm_id header_id: csh_return_atm_id
}, },
width: 900, width: 900,
...@@ -152,6 +162,27 @@ ...@@ -152,6 +162,27 @@
return '<a href="javascript:upload_attachment_win();" style="color:red">' + '附件上传' + '</a>'; return '<a href="javascript:upload_attachment_win();" style="color:red">' + '附件上传' + '</a>';
} }
function dep106_Onupdate(ds, record, name, value, oldVlaue) {
if (name == 'return_amount') {
var unwrite_off_amount = $('csh_transaction_receipt_return_maintain_ds').getCurrentRecord().get('unwrite_off_amount');
record.set('remain_amount', minus(unwrite_off_amount, value));
// record.set('remain_amount', );
}
if (name == 'return_bp_type') {
if(value == 'THIRD_PARTY'){
record.getField('bp_bank_account_name').setReadOnly(true);
record.getField('opposite_band_na').setReadOnly(true);
record.getField('bp_bank_account_num').setReadOnly(true);
record.getField('bp_bank_branch_name').setReadOnly(true);
}else{
//record.getField('bp_bank_account_name').setReadOnly(false);
record.getField('opposite_band_na').setReadOnly(false);
record.getField('bp_bank_account_num').setReadOnly(false);
record.getField('bp_bank_branch_name').setReadOnly(false);
}
}
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_transaction_deposit_return_maintain_ds" autoCreate="true"> <a:dataSet id="csh_transaction_deposit_return_maintain_ds" autoCreate="true">
...@@ -159,21 +190,32 @@ ...@@ -159,21 +190,32 @@
<a:field name="return_date" defaultValue="${/model/sys_time_default_value_path/record/@now_time}" <a:field name="return_date" defaultValue="${/model/sys_time_default_value_path/record/@now_time}"
required="true"/> required="true"/>
<a:field name="return_amount" required="true"/> <a:field name="return_amount" required="true"/>
<a:field name="csh_return_bp_name" lovGridHeight="350" lovHeight="500" <a:field name="csh_return_bp_name" lovGridHeight="350" lovHeight="550"
lovService="cus_deposit.CUS_DEPOSIT106.hls_bp_master_v_for_lov" lovWidth="500" lovService="cus_deposit.CUS_DEPOSIT106.hls_bp_master_bank_account_lov" lovWidth="900"
title="HLS.BP_TITLE" required="true"> title="退款用户" required="true">
<a:mapping> <a:mapping>
<a:map from="bp_id" to="csh_return_bp_id"/> <a:map from="bp_id" to="csh_return_bp_id"/>
<a:map from="bp_name" to="csh_return_bp_name"/> <a:map from="bp_name" to="csh_return_bp_name"/>
<a:map from="return_bp_type" to="return_bp_type"/>
<a:map from="bank_account_name" to="bp_bank_account_name"/>
<a:map from="bank_account_num" to="bp_bank_account_num"/>
<a:map from="bank_full_name" to="opposite_band_na"/>
<a:map from="bank_branch_name" to="bp_bank_branch_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="csh_return_bp_id"/> <a:field name="csh_return_bp_id"/>
<a:field name="bp_bank_account_name" defaultValue="${/parameter/@bp_bank_account_name}"/> <a:field name="bp_bank_account_name" defaultValue="${/parameter/@bp_bank_account_name}" required="true" readOnly="true"/>
<a:field name="opposite_band_na" defaultValue="${/parameter/@opposite_band_na}"/> <a:field name="opposite_band_na" defaultValue="${/parameter/@opposite_band_na}" required="true"/>
<a:field name="bp_bank_account_num" defaultValue="${/parameter/@bp_bank_account_num}"/> <a:field name="bp_bank_account_num" defaultValue="${/parameter/@bp_bank_account_num}" required="true"/>
<a:field name="return_id" defaultValue="${/parameter/@return_id}"/> <a:field name="bp_bank_branch_name" required="true"/>
<a:field name="return_id" defaultValue="${/parameter/@return_id}" />
<a:field name="left_amount" defaultValue="${/parameter/@left_amount}"/> <a:field name="left_amount" defaultValue="${/parameter/@left_amount}"/>
<a:field name="remain_amount" readOnly="true"/>
<a:field name="return_bp_type"/>
</a:fields> </a:fields>
<a:events>
<a:event name="update" handler="dep106_Onupdate"/>
</a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_deposit_cashflow_grid_ds" fetchAll="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query/query?return_id=${/parameter/@return_id}"/> <a:dataSet id="csh_deposit_cashflow_grid_ds" fetchAll="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query/query?return_id=${/parameter/@return_id}"/>
...@@ -218,13 +260,17 @@ ...@@ -218,13 +260,17 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" width="170"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" width="170"/>
<!--<a:numberField name="bp_bank_account_num" allowdecimals="false" bindTarget="csh_transaction_deposit_return_maintain_ds" <!--<a:numberField name="bp_bank_account_num" allowdecimals="false" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" width="170"/>--> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" width="170"/>-->
<a:label name="attach" bindTarget="csh_transaction_deposit_return_maintain_ds" renderer="attach_renderer" prompt="附件" width="185"/> <a:textField name="bp_bank_branch_name" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="对方分行名称" width="185"/>
<a:numberField name="remain_amount" allowDecimals="true" allowFormat="true"
bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="本次退款后剩余金额" readOnly="true" width="180"/>
<a:label name="attach" bindTarget="csh_transaction_deposit_return_maintain_ds" renderer="attach_renderer" prompt="附件" width="170"/>
</a:box> </a:box>
<a:box column="1"> <a:box column="1">
<a:textArea name="description" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="备注" <a:textArea name="description" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="备注"
width="849"/> width="849"/>
</a:box> </a:box>
</a:form> </a:form>
<a:grid id="csh_deposit_cashflow_grid_ds_id" bindTarget="csh_deposit_cashflow_grid_ds" marginHeight="200" marginWidth="80" navBar="true"> <a:grid id="csh_deposit_cashflow_grid_ds_id" bindTarget="csh_deposit_cashflow_grid_ds" marginHeight="200" marginWidth="80" navBar="true">
<!--<a:toolBar> <!--<a:toolBar>
...@@ -281,6 +327,7 @@ ...@@ -281,6 +327,7 @@
deposit_record.set('contract_number', record.get('contract_number')); deposit_record.set('contract_number', record.get('contract_number'));
deposit_record.set('bp_id_telnet_code', record.get('bp_id_telnet_code')); deposit_record.set('bp_id_telnet_code', record.get('bp_id_telnet_code'));
deposit_record.set('bp_id_telnet_n', record.get('bp_id_telnet_n')); deposit_record.set('bp_id_telnet_n', record.get('bp_id_telnet_n'));
deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
} }
]]></script> ]]></script>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_wfl.lview
View file @ c5992a6f
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.return_id = ${/parameter/@return_id}" <a:model-query defaultWhereClause="t1.return_id = ${/parameter/@return_id}"
model="cus_deposit.CUS_DEPOSIT106.get_csh_return_status" rootPath="default_value_path"/> model="cus_deposit.CUS_DEPOSIT106.get_csh_return_status" rootPath="default_value_path"/>
<a:model-query model="csh.CSH515.get_current_seq" rootPath="seq_info"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="cus_deposit1060_download_win_link" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="cus_deposit1060_download_win_link" url="${/request/@context_path}/downloadFile.lview"/>
...@@ -16,6 +17,8 @@ ...@@ -16,6 +17,8 @@
url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/csh_deposit_return_history_print.lsc"/> url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/csh_deposit_return_history_print.lsc"/>
<a:link id="check_csh_transaction_sbo_id" model="csh.CSH501.csh_transaction_return_print" <a:link id="check_csh_transaction_sbo_id" model="csh.CSH501.csh_transaction_return_print"
modelaction="execute"/> modelaction="execute"/>
<a:link id="save_finance_flag_id" model="cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query"
modelaction="execute"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function upload_attachment_win() { function upload_attachment_win() {
var record = $('csh_transaction_return_wfl_ds').getCurrentRecord(); var record = $('csh_transaction_return_wfl_ds').getCurrentRecord();
...@@ -26,7 +29,7 @@ ...@@ -26,7 +29,7 @@
url: $('cus_deposit1060_download_win_link').getUrl(), url: $('cus_deposit1060_download_win_link').getUrl(),
params: { params: {
winid: 'hn2050_upload_win', winid: 'hn2050_upload_win',
table_name: 'CSH_TRANSACTION_RETURN', table_name: 'CSH_TRANSACTION_RETURN_DEPOSIT',
header_id: csh_return_atm_id header_id: csh_return_atm_id
}, },
width: 900, width: 900,
...@@ -67,21 +70,79 @@ ...@@ -67,21 +70,79 @@
return '<a href="javascript:upload_attachment_win();" style="color:red">' + '附件查看' + '</a>'; return '<a href="javascript:upload_attachment_win();" style="color:red">' + '附件查看' + '</a>';
} }
if("${/model/seq_info/record/@position_012_flag}"=="1") {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
var return_record = $('csh_transaction_return_wfl_ds').getCurrentRecord();
if (type == 'agree') {
if (Leaf.isEmpty(return_record.get('finance_flag'))||return_record.get('finance_flag')!='Y') {
Leaf.showMessage('提示', '请先审核银行信息，并进行勾选通过。');
return false;
} else {
return true;
}
}else return true;
});
}
function csh106_return_save() {
var record = $('csh_transaction_return_wfl_ds').getCurrentRecord();
var return_id = record.get('return_id');
var finance_flag = record.get('finance_flag');
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('save_finance_flag_id').getUrl(),
para: {
return_id : return_id,
finance_flag : finance_flag
},
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
function onLoad_return_wfl_ds(ds)
{
var record=ds.getAt(0);
if("${/model/seq_info/record/@position_012_flag}"=="1" && "${/model/seq_info/record/@current_seq}"=="5") {
record.getField('finance_flag').setReadOnly(false);
record.set('finance_flag','N');
}else{
record.set('finance_flag','Y');
record.getField('finance_flag').setReadOnly(true);
}
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_transaction_return_wfl_ds" autoPageSize="true" autoQuery="true" <a:dataSet id="csh_transaction_return_wfl_ds" autoPageSize="true" autoQuery="true"
model="cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query" model="cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query"
queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query/query?return_id=${/parameter/@return_id}"> queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query/query?return_id=${/parameter/@return_id}">
<a:fields>
<a:field name="finance_flag" checkedValue="Y" defaultValue="N" readOnly="false" uncheckedValue="N"/>
</a:fields>
<a:events>
<a:event name="load" handler="onLoad_return_wfl_ds"/>
</a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_deposit_cashflow_grid_ds" fetchAll="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query/query?return_id=${/parameter/@return_id}"/> <a:dataSet id="csh_deposit_cashflow_grid_ds" fetchAll="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_deposit_cashflow_query/query?return_id=${/parameter/@return_id}"/>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
<a:gridButton id="csh106_return_print_id" click="csh515_return_print" text="保证金退款审批记录打印"/> <a:gridButton id="csh106_return_print_id" click="csh515_return_print" text="保证金退款审批记录打印"/>
<!-- <a:gridButton id="csh106_return_save_id" click="csh106_return_save" text="保存"/>-->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form title="CSH515.CSH_REFUND"> <a:form title="CSH515.CSH_REFUND">
<a:box column="3" labelWidth="115"> <a:box column="4" labelWidth="115">
<a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds" <a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds"
prompt="经济业务发生日" renderer="Leaf.formatDate" readOnly="true" width="180"/> prompt="经济业务发生日" renderer="Leaf.formatDate" readOnly="true" width="180"/>
<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" <a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false"
...@@ -89,6 +150,9 @@ ...@@ -89,6 +150,9 @@
prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true" width="170"/> prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true" width="170"/>
<a:textField name="csh_return_bp_name" bindTarget="csh_transaction_return_wfl_ds" prompt="退款商业伙伴" <a:textField name="csh_return_bp_name" bindTarget="csh_transaction_return_wfl_ds" prompt="退款商业伙伴"
readOnly="true" width="185"/> readOnly="true" width="185"/>
<a:numberField name="remain_amount" allowDecimals="true" allowFormat="true"
bindTarget="csh_transaction_return_wfl_ds"
prompt="本次退款后剩余金额" readOnly="true" width="170"/>
<!--<a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_DATE" renderer="Leaf.formatDate" readOnly="true"/>--> <!--<a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_DATE" renderer="Leaf.formatDate" readOnly="true"/>-->
<!--<a:lov name="period_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/>--> <!--<a:lov name="period_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/>-->
<!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.PAYMENT_METHOD" readOnly="true"/>--> <!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.PAYMENT_METHOD" readOnly="true"/>-->
...@@ -114,7 +178,10 @@ ...@@ -114,7 +178,10 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME" readOnly="true" width="170"/> prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME" readOnly="true" width="170"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds" <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true" width="185"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true" width="185"/>
<a:textField name="bp_bank_branch_name" bindTarget="csh_transaction_return_wfl_ds"
prompt="对方分行名称" readOnly="true" width="170"/>
<a:label name="attach" bindTarget="csh_transaction_return_wfl_ds" renderer="attach_renderer" prompt="附件" width="170"/> <a:label name="attach" bindTarget="csh_transaction_return_wfl_ds" renderer="attach_renderer" prompt="附件" width="170"/>
<a:checkBox name="finance_flag" bindTarget="csh_transaction_return_wfl_ds" prompt="财务部已经对银行信息进行过审核" readOnly="true"/>
<!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>--> <!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>-->
<!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>--> <!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>-->
<!--<a:comboBox name="currency_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.CURRENCY" readOnly="true"/>--> <!--<a:comboBox name="currency_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.CURRENCY" readOnly="true"/>-->
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ c5992a6f
...@@ -418,6 +418,13 @@ ...@@ -418,6 +418,13 @@
record.getField('id_card_no_leg').setRequired(false); record.getField('id_card_no_leg').setRequired(false);
} }
//第三方 证件号非必填 2022年12月29日09:41:15
if(record.get('bp_class') == 'ORG' && record.get("bp_type") == 'THIRD_PARTY'){
record.getField('social_code').setRequired(false);
}else if(record.get('bp_class') == 'NP' && record.get("bp_type") == 'THIRD_PARTY'){
record.getField('id_card_no').setRequired(false);
}
var employee_type_id = '${/model/modify_user/record/@employee_type_id}'; var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
old_bp_name = record.get('bp_name'); old_bp_name = record.get('bp_name');
new_bp_name = record.get('bp_name'); new_bp_name = record.get('bp_name');
......
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ c5992a6f
...@@ -29,7 +29,12 @@ ...@@ -29,7 +29,12 @@
function open_return_win(ds_id, record_id) { function open_return_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var header_id = record.data.return_id; var header_id = record.data.return_id;
var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id; var table_name = 'CSH_TRANSACTION_RETURN';
if(!Ext.isEmpty(record.get('csh_return_atm_id'))){
header_id = record.get('csh_return_atm_id');
table_name = 'CSH_TRANSACTION_RETURN_DEPOSIT';
}
var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name='+ table_name +'&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
var win = new Leaf.Window({ var win = new Leaf.Window({
url: url, url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}', title: '${l:HLS.SUPPORTING_DOCUMENT}',
......
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