Commit 0ae40fb4 authored by xsh241908's avatar xsh241908

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
parents 4b3af87e 96e9b5a8
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<bm:field name="guarantor_name_duty" /> <bm:field name="guarantor_name_duty" />
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/> <bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
<bm:field name="import_source"/> <bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
......
...@@ -82,6 +82,8 @@ ...@@ -82,6 +82,8 @@
<bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/> <bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
<bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/> <bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
<bm:field name="transaction_wfl_id"/> <bm:field name="transaction_wfl_id"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
...@@ -147,5 +149,6 @@ and cc.data_class = 'NORMAL' ...@@ -147,5 +149,6 @@ and cc.data_class = 'NORMAL'
and cwo.csh_transaction_id = t1.transaction_id and cwo.csh_transaction_id = t1.transaction_id
and hbm.bp_name like ${@bp_name_r})"/> and hbm.bp_name like ${@bp_name_r})"/>
<bm:query-field name="approval_status" queryExpression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')) = ${@approval_status}"/> <bm:query-field name="approval_status" queryExpression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')) = ${@approval_status}"/>
<bm:query-field field="import_source" queryOperator="="/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
<?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 t.*
from exp_org_position_vl t
WHERE t.POSITION_ID in
(SELECT t.POSITION_ID
FROM exp_employee_assigns t
where t.employee_id =
(SELECT t.employee_id FROM sys_user t where t.user_id = ${/session/@user_id}))
and t.position_code='012'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -102,6 +102,8 @@ ...@@ -102,6 +102,8 @@
<bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/> <bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag_desc" expression="(select code_value_name from sys_code_values_v where code = 'CONFIRMED_FLAG' and code_value = t1.confirmed_flag)" forceUpdate="false" forInsert="false"/> <bm:field name="confirmed_flag_desc" expression="(select code_value_name from sys_code_values_v where code = 'CONFIRMED_FLAG' and code_value = t1.confirmed_flag)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag"/> <bm:field name="confirmed_flag"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
<!--end--> <!--end-->
</bm:fields> </bm:fields>
<bm:features> <bm:features>
...@@ -164,7 +166,7 @@ ...@@ -164,7 +166,7 @@
<bm:query-field name="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like ${@bp_bank_account_num}"/> <bm:query-field name="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like ${@bp_bank_account_num}"/>
<bm:query-field name="bank_name" queryExpression="(select a.bank_short_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_name}"/> <bm:query-field name="bank_name" queryExpression="(select a.bank_short_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_name}"/>
<bm:query-field name="bank_branch_name" queryExpression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_branch_name}"/> <bm:query-field name="bank_branch_name" queryExpression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_branch_name}"/>
<bm:query-field field="import_source" queryOperator="="/>
<!--end--> <!--end-->
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
......
...@@ -26,42 +26,65 @@ ...@@ -26,42 +26,65 @@
</bm:operation> </bm:operation>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from ( select v1.contract_id, select *
(select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number, from (select v1.contract_id,
(select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name, (select cc.contract_number
--to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount, from con_contract cc
v1.unwrite_off_amount, where cc.contract_id = v1.contract_id) contract_number,
v1.deposit_trans_type, (select cc.contract_name
(select t.bp_name from con_contract cc
from hls_bp_master t, con_contract ct where cc.contract_id = v1.contract_id) contract_name,
where t.bp_id = ct.bp_id_tenant --to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
and ct.contract_id = v1.contract_id) bp_id_telnet_n, v1.unwrite_off_amount,
(select ct.bp_id_agent_level1 from v1.deposit_trans_type,
con_contract ct (select t.bp_name
where contract_id = v1.contract_id) bp_id_agent_level1, from hls_bp_master t, con_contract ct
(select t.bp_name where t.bp_id = ct.bp_id_tenant
from hls_bp_master t, con_contract ct and ct.contract_id = v1.contract_id) bp_id_telnet_n,
where t.bp_id = ct.bp_id_agent_level1 (select ct.bp_id_agent_level1
and ct.contract_id = v1.contract_id) bp_name, from con_contract ct
(select v.code_value_name where contract_id = v1.contract_id) bp_id_agent_level1,
from sys_code_values_v v (select t.bp_name
where v.code = 'DEPOSIT_TRANS_TYPE' from hls_bp_master t, con_contract ct
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n, where t.bp_id = ct.bp_id_agent_level1
nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status, and ct.contract_id = v1.contract_id) bp_name,
v1.bp_id (select v.code_value_name
from sys_code_values_v v
from (select tt.ref_contract_id contract_id, where v.code = 'DEPOSIT_TRANS_TYPE'
tt.deposit_trans_type, and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
sum((nvl(tt.transaction_amount, 0) - nvl((hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id => v1.contract_id,
nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount, p_user_id => 1)),
tt.bp_id '正常') approve_status,
from csh_transaction tt v1.bp_id,
where tt.transaction_type = 'DEPOSIT' nvl((SELECT tc.trans_review_status
and tt.ref_contract_id is not null FROM csh_transaction_contemp tc
and tt.transaction_amount > 0 where tc.contemp_id =
and tt.deposit_trans_type is not null (select max(contemp_id)
group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1 FROM csh_transaction_contemp tc
where v1.unwrite_off_amount>0)v where tc.source_contract_id = v1.contract_id
and tc.batch_id is not null)),'NEW') trans_review_status,
nvl((SELECT sc.code_value_name
FROM csh_transaction_contemp tc, sys_code_values_v sc
where tc.contemp_id =
(select max(contemp_id)
FROM csh_transaction_contemp tc
where tc.source_contract_id = v1.contract_id
and tc.batch_id is not null)
and sc.code = 'TRANS_REVIEW_STATUS'
AND sc.code_value =nvl(tc.trans_review_status,'NEW')),'新建') trans_review_status_n
from (select tt.ref_contract_id contract_id,
tt.deposit_trans_type,
sum((nvl(tt.transaction_amount, 0) -
nvl(tt.write_off_amount, 0) -
nvl(tt.returned_amount, 0))) unwrite_off_amount,
tt.bp_id
from csh_transaction tt
where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is not null
and tt.transaction_amount > 0
and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
where v1.unwrite_off_amount > 0) v
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
...@@ -71,9 +94,9 @@ ...@@ -71,9 +94,9 @@
<!--</bm:data-filters>--> <!--</bm:data-filters>-->
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/> <bm:query-field name="bp_name_n" queryExpression="v.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
<bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/> <bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
<bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
<bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
\ No newline at end of file
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="t1.bp_name = ${@bp_name_n}"/> <bm:query-field name="bp_name_n" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
<bm:query-field name="bp_id_telnet_n" queryExpression="t1.bp_id_telnet_n =${@bp_id_telnet_n}"/> <bm:query-field name="bp_id_telnet_n" queryExpression="t1.bp_id_telnet_n =${@bp_id_telnet_n}"/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.source_trans_type = ${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="t1.source_trans_type = ${@deposit_trans_type}"/>
<bm:query-field name="trans_review_status" queryExpression="t1.trans_review_status =${@trans_review_status}"/> <bm:query-field name="trans_review_status" queryExpression="t1.trans_review_status =${@trans_review_status}"/>
......
...@@ -53,7 +53,15 @@ ...@@ -53,7 +53,15 @@
<bm:field name="create_je_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CREATE_JE_FLAG"/> <bm:field name="create_je_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CREATE_JE_FLAG"/>
<bm:field name="gld_interface_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="GLD_INTERFACE_FLAG" prompt="CSH511.CSH_TRANSACTION.GLD_INTERFACE_FLAG"/> <bm:field name="gld_interface_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="GLD_INTERFACE_FLAG" prompt="CSH511.CSH_TRANSACTION.GLD_INTERFACE_FLAG"/>
<bm:field name="bp_code" expression="(select d.bp_code from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_CODE"/> <bm:field name="bp_code" expression="(select d.bp_code from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_CODE"/>
<bm:field name="bp_name" expression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_NAME"/> <bm:field name="bp_name" expression="(select d.bp_name
from hls_bp_master_v d
where d.bp_id = (case
when ( SELECT c.division
FROM con_contract c
WHERE c.contract_id = t1.ref_contract_id) = '70' then
(SELECT cc.bp_id_agent_level1
FROM con_contract cc
WHERE cc.contract_id = t1.ref_contract_id) else t1.bp_id end))" forInsert="false" forUpdate="false" prompt="HLS.BP_NAME"/>
<bm:field name="unit_id" expression="(select d.unit_id from hls_bp_master d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false"/> <bm:field name="unit_id" expression="(select d.unit_id from hls_bp_master d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false"/>
<bm:field name="payment_method_display" expression="(select cp.description from csh_payment_method cp where cp.payment_method_id=t1.payment_method_id)" forInsert="false" forUpdate="false" prompt="HLS.PAYMENT_METHOD"/> <bm:field name="payment_method_display" expression="(select cp.description from csh_payment_method cp where cp.payment_method_id=t1.payment_method_id)" forInsert="false" forUpdate="false" prompt="HLS.PAYMENT_METHOD"/>
<bm:field name="currency_name" expression="(select gc.currency_name from gld_currency_vl gc where gc.currency_code=t1.currency_code)" forInsert="false" forUpdate="false" prompt="HLS.CURRENCY"/> <bm:field name="currency_name" expression="(select gc.currency_name from gld_currency_vl gc where gc.currency_code=t1.currency_code)" forInsert="false" forUpdate="false" prompt="HLS.CURRENCY"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: WW
$Date: 2014-11-13 下午5:36:09
$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 t1.user_id,t1.user_name FROM sys_user t1 #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="user_id" queryExpression="t1.user_id=${@user_id}"/>
</bm:query-fields>
</bm:model>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</bm:features> </bm:features>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="merge_parent_flag" queryOperator="="/> <bm:query-field field="merge_parent_flag" queryOperator="="/>
<bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 = ${@contract_number})"/> <bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 like ${@contract_number})"/>
<bm:query-field field="journal_num" queryOperator="like"/> <bm:query-field field="journal_num" queryOperator="like"/>
<bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/> <bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
<bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/> <bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
delete from hl_hsbc_doc_temp t where t.session_id = ${/session/@session_id}
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
hl_hsbc_interface_pkg.insert_doc_temp_return(
p_session_id=>${/session/@session_id},
p_return_id=>${@return_id},
p_return_transaction_id=>${@return_transaction_id},
p_tranamount =>${@this_return_amount},
p_user_id=>${/session/@user_id},
p_button_id => ${/parameter/@button_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hl_hsbc_interface_pkg.create_batch_return(p_session_id => ${/session/@session_id},
p_bank_account_id => ${@bank_account_id},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t.project_id,
t.project_number,
t.amount
from wh_train_project_lv t
#WHERE_CLAUSE#]]></bm:query-sql>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
wh_train_project_pkg.project_submit(p_project_id =>${@project_id},,
p_user_id =>${/session/@user_id}
p_user_id =>${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="project_id" dataType="java.lang.String" queryExpression="project_id = ${@project_id}"/>
<bm:query-field name="project_number" dataType="java.lang.String" queryExpression="project_number like &apos;%&apos;||${@project_number}||&apos;%&apos;"/>
<bm:query-field name="amount" dataType="java.lang.String" queryExpression="amount = ${@amount}"/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: ZLF $Author: ZLF
$Date: 2015-1-21 下午3:09:38 $Date: 2015-1-21 下午3:09:38
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from ( select * from (
SELECT t.contract_id, SELECT t.contract_id,
t.invoice_hd_id, t.invoice_hd_id,
t.invoice_line_id, t.invoice_line_id,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code = 'ACR510_INVOICE_KIND' WHERE v.code = 'ACR510_INVOICE_KIND'
AND v.code_value = t.invoice_kind)invoice_kind_n, AND v.code_value = t.invoice_kind)invoice_kind_n,
t.cashflow_id, t.cashflow_id,
t.tax_apply_month invoice_month, t.tax_apply_month invoice_month,
t.invoice_date, t.invoice_date,
t.invoice_number, t.invoice_number,
t.invoice_tax_amount total_amount, t.invoice_tax_amount total_amount,
t.apply_flag for_invoice_flag, t.apply_flag for_invoice_flag,
t.tenant_name bp_name, t.tenant_name bp_name,
t.contract_number, t.contract_number,
t.acr_tax_amount return_tax_amount, t.acr_tax_amount return_tax_amount,
t.journal_tax_amount amount_cr, t.journal_tax_amount amount_cr,
t.journal_month je_month, t.journal_month je_month,
t.journal_date je_date, t.journal_date je_date,
t.journal_num, t.journal_num,
t.times, t.times,
t.due_date, t.due_date,
t.due_amount, t.due_amount,
t.principal, t.principal,
t.interest, t.interest,
t.tax_amount vat_due_amount, t.tax_amount vat_due_amount,
t.created_by, t.created_by,
t.creation_date, t.creation_date,
t.last_updated_by, t.last_updated_by,
t.last_update_date, t.last_update_date,
t.tax_type_rate t.tax_type_rate
FROM vat_account_tmp t FROM vat_account_tmp t
WHERE t.session_id=${/session/@session_id} WHERE t.session_id=${/session/@session_id}
) t1 ) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
--order by invoice_hd_id,due_date ASC,invoice_line_id asc --order by invoice_hd_id,due_date ASC,invoice_line_id asc
order by invoice_hd_id, invoice_number asc, due_date ASC order by invoice_hd_id, invoice_number asc, due_date ASC
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
BEGIN BEGIN
hl_cm_vat_report_pkg.vat_account_data_process(p_base_period => ${@base_period}, hl_cm_vat_report_pkg.vat_account_data_process(p_base_period => ${@base_period},
p_session_id => ${/session/@session_id}, p_session_id => ${/session/@session_id},
p_user_id => ${/session/@user_id} ); p_user_id => ${/session/@user_id} );
END; END;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>--> <!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>-->
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/> <bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/> <bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
<!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>--> <!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>-->
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/> <bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/> <bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/> <bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: DJ
$Date: 2013-4-14 下午02:19:46
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT
v.function_id,
v.function_code,
v.function_name,
v.menu_id,
v.parent_menu_id,
case when v.menu_type = 'MENU' then
(case when (select count(*) from sys_role_module_home_page srmw where srmw.function_group_id = v.function_id and srmw.role_id = v.role_id and srmw.subject = ${/session/@subject}) > 0 then 'role_module'
when (select count(*) from sys_module_home_page smhp where smhp.function_group_id = v.function_id and smhp.subject = ${/session/@subject}) > 0 then 'module'
else 'none' end
)else 'none' end module_flag,
(select nvl(sum(1),0) from sys_role_menu_v v1 where v1.parent_menu_id=v.menu_id) sub_menu_count
FROM
sys_role_menu_v v #WHERE_CLAUSE#
ORDER BY
v.layout_sequence
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="v.role_id=${/session/@role_id}"/>
<bm:data-filter enforceOperations="query" expression="((not exists (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.function_id = v.function_id)) or (exists (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.user_id = ${/session/@user_id} and f.function_id = v.function_id)))"/>
<!--<bm:data-filter enforceOperations="query" expression="((v.function_code != 'CON3200') or(v.function_code = 'CON3200' AND ((v.role_code not in ('0018', '0019')) or (v.role_code in ('0018', '0019') and exists (select 1 from sys_user u, sys_user_role_groups r where u.user_id = r.user_id and r.role_id = v.role_id AND u.user_id = ${/session/@user_id} and u.user_name in ('MJ001', 'MJ002'))))))"/>
-->
</bm:data-filters>
</bm:model>
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<ns1:field name="employee_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" prompt="用户姓名"/> <ns1:field name="employee_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" prompt="用户姓名"/>
<ns1:field name="email" forDisplay="true" prompt="邮箱"/> <ns1:field name="email" forDisplay="true" prompt="邮箱"/>
<ns1:field name="mobil" forDisplay="true" prompt="号码"/> <ns1:field name="mobil" forDisplay="true" prompt="号码"/>
<ns1:field name="role_admin_amount" expression="(select count(1) from SYS_USER_ROLE_GROUPS_VL t where t.enabled_flag = &apos;Y&apos; and t.role_code in (&apos;0017&apos;,&apos;HAND&apos;) and t.user_id = t1.user_id and t.role_id = ${/session/@role_id})"/>
</ns1:fields> </ns1:fields>
<ns1:query-fields> <ns1:query-fields>
<ns1:query-field field="user_name" queryOperator="like"/> <ns1:query-field field="user_name" queryOperator="like"/>
......
remove_query_field('CONTRACT_ID'); remove_query_field('CONTRACT_ID');
remove_datafilter('contract_id'); remove_datafilter('contract_id');
var add_datafilters=[ var add_datafilters=[
{ {
name:'bp_id', name:'bp_id',
expression:'(t1.bp_id = ${@bp_id})' expression:'(t1.bp_id = ${@bp_id})'
} }
]; ];
add_datafilter(); add_datafilter();
\ No newline at end of file
// var override_queryfields = [ /*
// { var override_queryfields = [
// name : 'period_name', {in (${@division})
// queryexpression : "t1.period_name =${@period_name}" name : 'lease_name',
// }] queryexpression : 't1.division in (${@lease_name})'
}]
*/
var add_datafilters = [ { var add_datafilters = [ {
name : 'period_name', name : 'period_names',
expression : 't1.period_name=${@period_name}' expression : 't1.period_name=${@period_names}'
} ]; },
{
name : 'divisions',
expression : 't1.division in (${@division1},${@division2},${@division3},${@division4},${@division5},${@division6},${@division7},${@division8},{@division9}) '
}
];
add_datafilter(); add_datafilter();
// override(); //override();
\ No newline at end of file \ No newline at end of file
var override_queryfields = [
{
name : 'payment_req_number',
queryexpression : "transaction_num = ${@payment_req_number}"
},
{
name : 'approval_date_from',
queryexpression : "trunc(t1.approval_date) >= to_date(${@approval_date_from},'yyyy-mm-dd')"
},
{
name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
}
];
override();
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
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')" expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.cf_item = '0'"
} }
]; ];
......
var override_queryfields = [
{
name : 'creationdate_from',
queryexpression : "trunc(t1.creationdate) >= to_date(${@creationdate_from},'yyyy-mm-dd')"
},
{
name : 'creationdate_to',
queryexpression : "trunc(t1.creationdate) <= to_date(${@creationdate_to},'yyyy-mm-dd')"
}
];
var add_datafilters = [
{
name : 'init_filter',
expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.collection_classes = 'REFUND'"
}
];
add_datafilter();
override();
...@@ -153,6 +153,12 @@ ...@@ -153,6 +153,12 @@
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'none';
} }
if('${/parameter/@layout_code}' == "CONTRACT_CREATE_INC" && record.get('division') == '70'){
if(Ext.isEmpty(record.get('guarantee_letter_f'))){
record.set('guarantee_letter_f','N');
record.set('guarantee_letter_f_n','否');
}
}
} }
}; };
...@@ -711,7 +717,6 @@ ...@@ -711,7 +717,6 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item'); var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
if(ds.id == lease_item_ds_id&&lease_item_ds_id){ if(ds.id == lease_item_ds_id&&lease_item_ds_id){
debugger;
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70'){ if(record.data.division=='70'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
...@@ -753,6 +758,7 @@ ...@@ -753,6 +758,7 @@
} }
}; };
]]></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>
......
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
}, },
success: function (res) { success: function (res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
if (res.result.record.submitted_flag == 'Y') { if (res.result.record.submitted_flag == 'Y' && '${/parameter/@source_type}' != 'WFL_Y') {
Leaf.showMessage('${l:PROMPT}', '该单据已经提交'); Leaf.showMessage('${l:PROMPT}', '该单据已经提交');
check_flag = false; check_flag = false;
} else { } else {
......
...@@ -594,6 +594,7 @@ ...@@ -594,6 +594,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="position_code_ds"> <a:dataSet id="position_code_ds">
<a:datas dataSource="/model/position_code"/> <a:datas dataSource="/model/position_code"/>
</a:dataSet> </a:dataSet>
...@@ -818,7 +819,7 @@ ...@@ -818,7 +819,7 @@
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/> <a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="csh510_receipt_maintain_update"/> <a:event name="update" handler="csh510_receipt_maintain_update"/>
...@@ -894,6 +895,8 @@ ...@@ -894,6 +895,8 @@
<!-- <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>--> <!-- <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->
<a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds" <a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/> prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="新增路径"/>
</a:fieldSet> </a:fieldSet>
...@@ -928,7 +931,7 @@ ...@@ -928,7 +931,7 @@
<a:column name="guarantor_name_duty" hidden="true" /> <a:column name="guarantor_name_duty" hidden="true" />
<a:column name="paid_byother_flag" hidden="true"/> <a:column name="paid_byother_flag" hidden="true"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" <a:column name="confirmed_flag_desc" prompt="单据审批状态"
align="center"/> align="center"/>
<!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"--> <!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"-->
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) { function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
if (name == 'bp_id') { if (name == 'bp_id') {
if (value != oldvalue) { if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD') {
record.set('bp_bank_account_id', ''); record.set('bp_bank_account_id', '');
record.set('bp_bank_account_code', ''); record.set('bp_bank_account_code', '');
record.set('bp_bank_account_name', ''); record.set('bp_bank_account_name', '');
...@@ -839,5 +839,20 @@ ...@@ -839,5 +839,20 @@
</a:screenBody> </a:screenBody>
<script type="text/javascript"><![CDATA[
Leaf.onReady(init);
function init() {
if('${/parameter/@import_source}' == 'HSBC_ADD'){
var record = $('csh_transaction_receipt_head_ds').getAt(0);
record.getField('transaction_date').setReadOnly(true);
record.getField('transaction_amount').setReadOnly(true);
record.getField('bank_slip_num').setReadOnly(true);
record.getField('ref_v05').setReadOnly(true);
record.getField('bank_account_name').setReadOnly(true);
record.getField('bp_bank_account_name').setReadOnly(true);
}
}
]]></script>
</a:view> </a:view>
</a:screen> </a:screen>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
return value; return value;
}*/ }*/
if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){ if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){
url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'; url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source');
}else{ }else{
url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false'; url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
} }
......
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="currency_ds"> <a:dataSet id="currency_ds">
<a:datas dataSource="/model/currency"/> <a:datas dataSource="/model/currency"/>
</a:dataSet> </a:dataSet>
...@@ -241,6 +242,7 @@ ...@@ -241,6 +242,7 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="approval_status_desc" displayField="code_value_name" options="approval_status_ds" returnField="approval_status" valueField="code_value"/> <a:field name="approval_status_desc" displayField="code_value_name" options="approval_status_ds" returnField="approval_status" valueField="code_value"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="csh514_reversed_update"/> <a:event name="update" handler="csh514_reversed_update"/>
...@@ -317,6 +319,7 @@ ...@@ -317,6 +319,7 @@
prompt="合同编号"/> prompt="合同编号"/>
<a:comboBox name="approval_status_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds" <a:comboBox name="approval_status_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds"
prompt="审批状态"/> prompt="审批状态"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds" prompt="新增路径"/>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds" <a:grid id="csh_transaction_receipt_write_off_grid_ds"
bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35" bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35"
...@@ -350,6 +353,7 @@ ...@@ -350,6 +353,7 @@
<a:column name="bank_account_name" width="120"/> <a:column name="bank_account_name" width="120"/>
<a:column name="transaction_type_desc" align="center" prompt="事务类型" width="120"/> <a:column name="transaction_type_desc" align="center" prompt="事务类型" width="120"/>
<a:column name="receipt_type_des" align="center" prompt="收款类型" width="120"/> <a:column name="receipt_type_des" align="center" prompt="收款类型" width="120"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="approval_status_desc" align="center" prompt="审批状态" width="120"/> <a:column name="approval_status_desc" align="center" prompt="审批状态" width="120"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<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: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"/>
...@@ -37,16 +38,30 @@ ...@@ -37,16 +38,30 @@
// // window.open(url, '_self'); // // window.open(url, '_self');
// } // }
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
/* var transaction_amount = ${/parameter/@transaction_amount}||0; /* var transaction_amount = ${/parameter/@transaction_amount}||0;
var return_amount = ${/parameter/@returned_amount}||0; var return_amount = ${/parameter/@returned_amount}||0;
var write_off_amount = ${/parameter/@write_off_amount}||0; var write_off_amount = ${/parameter/@write_off_amount}||0;
var remain_total_amount = ${/parameter/@remain_total_amount}||0; var remain_total_amount = ${/parameter/@remain_total_amount}||0;
var bank_slip_num = '${/parameter/@bank_slip_num}';*/ var bank_slip_num = '${/parameter/@bank_slip_num}';*/
record.set('remain_total_amount',remain_total_amount); // record.set('remain_total_amount',remain_total_amount);
record.set('bank_slip_num',bank_slip_num); // record.set('bank_slip_num',bank_slip_num);
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";
}
}; };
//保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var band_na = $(ds_id).getAt(0).get('opposite_band_na');
var bank_branch_name = $(ds_id).getAt(0).get('bp_bank_branch_name');
if(bank_branch_name.indexOf(band_na)==-1){
Leaf.showMessage('提示', '请填写支行全称(例如:上海浦东发展银行外高桥保税区支行)');
return false;
}
}
//提交按钮 //提交按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
...@@ -58,11 +73,17 @@ ...@@ -58,11 +73,17 @@
var return_amount = $(ds_id).getAt(0).get('return_amount'); var return_amount = $(ds_id).getAt(0).get('return_amount');
var write_off_amount = $(ds_id).getAt(0).get('write_off_amount'); var write_off_amount = $(ds_id).getAt(0).get('write_off_amount');
var remain_total_amount = $(ds_id).getAt(0).get('remain_total_amount'); var remain_total_amount = $(ds_id).getAt(0).get('remain_total_amount');
var band_na = $(ds_id).getAt(0).get('opposite_band_na');
var bank_branch_name = $(ds_id).getAt(0).get('bp_bank_branch_name');
// var check_amount = parseFloat(transaction_amount) - parseFloat(this_return_amount) - parseFloat(return_amount) - parseFloat(write_off_amount); // var check_amount = parseFloat(transaction_amount) - parseFloat(this_return_amount) - parseFloat(return_amount) - parseFloat(write_off_amount);
if (!return_id) { if (!return_id) {
Leaf.showMessage('提示', '请先保存再提交'); Leaf.showMessage('提示', '请先保存再提交');
return; return;
} }
if(bank_branch_name.indexOf(band_na)==-1){
Leaf.showMessage('提示', '请填写支行全称(例如:上海浦东发展银行外高桥保税区支行)');
return;
}
if(this_return_amount > parseFloat(remain_total_amount)){ if(this_return_amount > parseFloat(remain_total_amount)){
Leaf.showMessage('提示', '退款金额不能大于可退款金额!'); Leaf.showMessage('提示', '退款金额不能大于可退款金额!');
return; return;
...@@ -73,7 +94,7 @@ ...@@ -73,7 +94,7 @@
// return; // return;
// } // }
$L.showConfirm("提示",'确认提交审批?',function(){ $L.showConfirm("提示",'确认提交审批?</br>【注意】“退款对方账户银行及分行”需填写完整的银行及分行全称,请检查填写是否正确!',function(){
var detail_mask = $('${/parameter/@winid}').wrap; var detail_mask = $('${/parameter/@winid}').wrap;
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}'); Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.request({ Leaf.request({
...@@ -128,14 +149,18 @@ ...@@ -128,14 +149,18 @@
//更新时调用 //更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return'); var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
if (return_ds == ds.id) { if (return_ds == ds.id) {
if (name == 'return_bp_type' && value == 'OTHER') { if (name == 'return_bp_type' && value == 'THIRD_PARTY') {
record.getField('return_bp_code').setRequired(true); record.getField('bp_bank_account_num').setReadOnly(true);
record.getField('bp_bank_account_name').setReadOnly(false); record.getField('bp_bank_account_name').setReadOnly(true);
}else if(name == 'return_bp_type' && value != 'OTHER'){ record.getField('opposite_band_na').setReadOnly(true);
record.getField('return_bp_code').setRequired(false); record.getField('bp_bank_branch_name').setReadOnly(true);
}
if (name == 'return_bp_type' && (value == 'AGENT'||value == 'TENANT')){
record.getField('bp_bank_account_num').setReadOnly(false);
record.getField('bp_bank_account_name').setReadOnly(true); record.getField('bp_bank_account_name').setReadOnly(true);
record.getField('opposite_band_na').setReadOnly(false);
record.getField('bp_bank_branch_name').setReadOnly(false);
} }
} }
}; };
......
...@@ -509,6 +509,7 @@ ...@@ -509,6 +509,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/> <a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds"> <a:dataSet id="confirmed_flag_ds">
<a:datas> <a:datas>
...@@ -555,6 +556,7 @@ ...@@ -555,6 +556,7 @@
<a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/> <a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
<a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value" <a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
defaultValue="code_value_name" returnField="receipt_type"/> defaultValue="code_value_name" returnField="receipt_type"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/> <a:event name="update" handler="csh513_receipt_write_off_update"/>
...@@ -630,6 +632,9 @@ ...@@ -630,6 +632,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/> prompt="单据审批状态"/>
</a:box> </a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet> </a:fieldSet>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds" <a:grid id="csh_transaction_receipt_write_off_grid_ds"
...@@ -673,6 +678,7 @@ ...@@ -673,6 +678,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>--> <!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>--> <!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/> <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/> <a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>--> <!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>--> <!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
...@@ -518,6 +518,7 @@ ...@@ -518,6 +518,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/> <a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds"> <a:dataSet id="confirmed_flag_ds">
<a:datas> <a:datas>
...@@ -565,6 +566,7 @@ ...@@ -565,6 +566,7 @@
<a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/> <a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}"/>
<a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value" <a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
defaultValue="code_value_name" returnField="receipt_type"/> defaultValue="code_value_name" returnField="receipt_type"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/> <a:event name="update" handler="csh513_receipt_write_off_update"/>
...@@ -642,6 +644,9 @@ ...@@ -642,6 +644,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/> prompt="单据审批状态"/>
</a:box> </a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet> </a:fieldSet>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds" <a:grid id="csh_transaction_receipt_write_off_grid_ds"
...@@ -685,6 +690,7 @@ ...@@ -685,6 +690,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>--> <!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>--> <!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/> <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/> <a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>--> <!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>--> <!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<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: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"/>
...@@ -18,13 +19,57 @@ ...@@ -18,13 +19,57 @@
<a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var transaction_amount = record.get('transaction_amount') || 0; var transaction_amount = record.get('transaction_amount') || 0;
var return_amount = record.get('return_amount') || 0; var return_amount = record.get('return_amount') || 0;
var write_off_amount = record.get('write_off_amount') || 0; var write_off_amount = record.get('write_off_amount') || 0;
var deposit_total_amount = parseFloat(transaction_amount - write_off_amount - return_amount).toFixed(2); var deposit_total_amount = parseFloat(transaction_amount - write_off_amount - return_amount).toFixed(2);
record.set('deposit_total_amount', deposit_total_amount); record.set('deposit_total_amount', deposit_total_amount);
}; //调整后不为默认值高亮显示
if (record.get('bp_bank_branch_name') != record.get('bp_bank_branch_name_n')){
// 获取对应字段div的id
var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_BP_BANK_BRANCH_NAME');
// 获取当前div下所有input组件
var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
// 设定第一个input组件background的color
req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
};
if (record.get('bp_bank_account_num') != record.get('bp_bank_account_num_n')){
// 获取对应字段div的id
var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_BP_BANK_ACCOUNT_NUM');
// 获取当前div下所有input组件
var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
// 设定第一个input组件background的color
req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
};
if (record.get('opposite_band_na') != record.get('opposite_band_na_n')){
// 获取对应字段div的id
var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_FORM_CSH_TRANSACTION_RETURN_OPPOSITE_BAND_NA');
// 获取当前div下所有input组件
var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
// 设定第一个input组件background的color
req_change_input_1[0].style.setProperty('background-color','#ff8465','important');
};
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/post_info/record/@position_code}"=="012") {
record.getField('this_return_amount').setReadOnly(true);
record.getField('return_date').setReadOnly(true);
record.getField('bp_bank_branch_name').setReadOnly(true);
record.getField('notes').setReadOnly(true);
record.getField('return_bp_type').setReadOnly(true);
record.getField('return_bp_type_n').setReadOnly(true);
}
var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
if (return_ds == ds.id) {
record.getField('bp_bank_account_num').setReadOnly(true);
record.getField('bp_bank_account_name').setReadOnly(true);
record.getField('opposite_band_na').setReadOnly(true);
record.getField('bp_bank_branch_name').setReadOnly(true);
}
};
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var return_id = $(ds_id).getAt(0).get('return_id'); var return_id = $(ds_id).getAt(0).get('return_id');
...@@ -130,6 +175,8 @@ ...@@ -130,6 +175,8 @@
//add by zhuxianfei 20181108 拒绝需要输入意见 //add by zhuxianfei 20181108 拒绝需要输入意见
function zjwfl5110_beforeapproveCheck(type) { function zjwfl5110_beforeapproveCheck(type) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var return_recode = $(ds_id).getCurrentRecord();
if (type == 'refuse') { if (type == 'refuse') {
if ('${/parameter/@instance_id}') { if ('${/parameter/@instance_id}') {
var root_ds = $('${/parameter/@layout_code}_virtual_ds'); var root_ds = $('${/parameter/@layout_code}_virtual_ds');
...@@ -143,10 +190,25 @@ ...@@ -143,10 +190,25 @@
} }
}else { }else {
return true; return true;
} }
} }
if("${/model/post_info/record/@position_code}"=="012") {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var return_recode = $(ds_id).getCurrentRecord();
var root_ds = $('${/parameter/@layout_code}_virtual_ds');
if (type == 'agree') {
if (Leaf.isEmpty(return_recode.get('finance_flag'))||return_recode.get('finance_flag')!='Y') {
Leaf.showMessage('提示', '请先审核第三方银行信息,并进行勾选通过。');
return false;
} else {
return true;
}
}else return true;
});
}
]]></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"/>
......
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/> <a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
<a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true"> <a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="deposit_trans_type"/> <a:field name="deposit_trans_type"/>
...@@ -87,6 +88,8 @@ ...@@ -87,6 +88,8 @@
<a:field name="bp_id_telnet_n"/> <a:field name="bp_id_telnet_n"/>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS" <a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/> returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single"> <a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single">
...@@ -105,6 +108,7 @@ ...@@ -105,6 +108,7 @@
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_deposit_transfer_maintain_query_ds"/> <a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_deposit_transfer_maintain_query_ds"/> <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/> <a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
</a:form> </a:form>
<a:fieldSet labelWidth="150" style="margin-left:20px"> <a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" > <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
...@@ -116,6 +120,7 @@ ...@@ -116,6 +120,7 @@
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/> <a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" /> <a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" />
<a:column name="approve_status" prompt="状态" width="120" align="center"/> <a:column name="approve_status" prompt="状态" width="120" align="center"/>
<a:column name="trans_review_status_n" prompt="复核状态" width="120" align="center"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:fieldSet> </a:fieldSet>
......
...@@ -6,58 +6,85 @@ ...@@ -6,58 +6,85 @@
$Purpose: 商业伙伴创建 入口界面 $Purpose: 商业伙伴创建 入口界面
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="hls.HLS214N.sys_user_lv" rootPath="user_name_path"/>
</a:init-procedure>
<a:view> <a:view>
<a:link id="hls_bp_master_link" url="${/request/@context_path}/modules/hls/HLS213N/hls_bp_master_create.lview"/> <a:link id="hls_bp_master_link" url="${/request/@context_path}/modules/hls/HLS213N/hls_bp_master_create.lview"/>
<a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_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');
var record = $(ds_id).getCurrentRecord(); var record = $(ds_id).getCurrentRecord();
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
record.set('function_code', 'HLS213D'); if(record.get('bp_type')=='THIRD_PARTY'){
record.set('function_usage', 'CREATE'); record.set('function_code', 'HLS213D_N');
record.set('default_value_dsid', ds_id); record.set('function_usage', 'CREATE');
record.data['url_title'] = '商业伙伴创建'; record.set('default_value_dsid', ds_id);
var param = record.data; record.data['url_title'] = '商业伙伴创建';
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}'); var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
}else{
record.set('function_code', 'HLS213D');
record.set('function_usage', 'CREATE');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '商业伙伴创建';
var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
}
}
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq){
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
if(f_bp_create_ds_id==ds.id){
if(name=='bp_type'){
//deron 将承租人与经销商分开录入,没有供应商
// if(value=='AGENT' || value=='GUTA_ORG' || value=='VENDER'){
if(value=='GUTA_ORG'){
record.set('bp_class','ORG');
record.set('bp_class_n','法人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='GUTA_NP'){
record.set('bp_class','NP');
record.set('bp_class_n','自然人');
record.getField('bp_class_n').setReadOnly(true);
} }
}; else if(value=='TENANT'){
//更新时调用 record.getField('bp_class_n').setReadOnly(false);
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq){ }else{
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); record.getField('bp_class_n').setReadOnly(false);
if(f_bp_create_ds_id==ds.id){
if(name=='bp_type'){
//deron 将承租人与经销商分开录入,没有供应商
// if(value=='AGENT' || value=='GUTA_ORG' || value=='VENDER'){
if(value=='GUTA_ORG'){
record.set('bp_class','ORG');
record.set('bp_class_n','法人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='GUTA_NP'){
record.set('bp_class','NP');
record.set('bp_class_n','自然人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='TENANT'){
record.getField('bp_class_n').setReadOnly(false);
}else{
record.getField('bp_class_n').setReadOnly(false);
}
} }
} }
}; }
};
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
if(ds.id == bp_create_ds_id){ if(ds.id == bp_create_ds_id) {
var r= $(bp_create_ds_id).getCurrentRecord(); var r = $(bp_create_ds_id).getCurrentRecord();
if(!r.get('bp_category')){ if (!r.get('bp_category')) {
r.set('bp_category','TENANT'); if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
r.set('bp_category_n','承租人'); r.set('bp_category', 'THIRD_PARTY');
r.set('bp_category_n', '第三方');
}else{
r.set('bp_category', 'TENANT');
r.set('bp_category_n', '承租人');
}
} }
}
if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
r.set('bp_type','THIRD_PARTY');
r.set('bp_type_n', '第三方');
}else{
r.set('bp_type','TENANT') ;
r.set('bp_type_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"/>
......
...@@ -47,6 +47,26 @@ ...@@ -47,6 +47,26 @@
// return; // return;
// } // }
// } // }
var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
var bank_record = $(bank_ds_id).getAll();
var flag = true;
if(bank_record.length>0){
for(var i=0;i<bank_record.length;i++){
var full_name=bank_record[i].get('bank_full_name');
var branch_name=bank_record[i].get('bank_branch_name');
if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
!Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
if(branch_name.indexOf(full_name)==-1){
flag = false;
}
}
}
}
if(flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称(例如:上海浦东发展银行外高桥保税区支行)');
return false;
}
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role'); var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var v_primary_flag_count=0; var v_primary_flag_count=0;
var role_records = $(role_ds_id).getAll(); var role_records = $(role_ds_id).getAll();
......
...@@ -150,6 +150,26 @@ ...@@ -150,6 +150,26 @@
var agent_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division'); var agent_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
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');
var record_agent =$(agent_id).getAll(); var record_agent =$(agent_id).getAll();
var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_bank_account');
var bank_record = $(bank_ds_id).getAll();
if(bank_record.length>0){
var flag = true;
for(var i=0;i<bank_record.length;i++){
var full_name=bank_record[i].get('bank_full_name');
var branch_name=bank_record[i].get('bank_branch_name');
if (!Leaf.isEmpty(bank_record[i].get('bank_full_name'))&&
!Leaf.isEmpty(bank_record[i].get('bank_branch_name'))){
if(branch_name.indexOf(full_name)==-1){
flag = false;
}
}
if(flag == false){
Leaf.showErrorMessage('${l:PROMPT}', '请填写支行全称(例如:上海浦东发展银行外高桥保税区支行)');
return false;
}
}
}
//增加三位字母大写的校验 //增加三位字母大写的校验
var head_record = $(ds_id).getCurrentRecord(); var head_record = $(ds_id).getCurrentRecord();
var english_name= head_record.get('english_name'); var english_name= head_record.get('english_name');
...@@ -178,11 +198,12 @@ ...@@ -178,11 +198,12 @@
return false; return false;
}} }}
if(social_code){ if(social_code){
if(!CheckSocialCreditCode(social_code)){ // if(!CheckSocialCreditCode(social_code)){
$L.showErrorMessage("错误",'请输入正确的社会信用代码!',null,null); // $L.showErrorMessage("错误",'请输入正确的社会信用代码!',null,null);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; // return false;
}} // }
}
}; };
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
...@@ -308,6 +329,9 @@ ...@@ -308,6 +329,9 @@
record.getField('agent_bs_area_level').setPropertity('validator', 'hls303_record_field_validator'); record.getField('agent_bs_area_level').setPropertity('validator', 'hls303_record_field_validator');
record.getField('validity_period_from').setPropertity('validator', 'hls303_record_field_validator'); record.getField('validity_period_from').setPropertity('validator', 'hls303_record_field_validator');
record.getField('validity_period_to').setPropertity('validator', 'hls303_record_field_validator'); record.getField('validity_period_to').setPropertity('validator', 'hls303_record_field_validator');
if(record.get('extra_nam')=='茂甲'||record.get('extra_nam')=='铁甲'){
record.getField('agent_phone').setRequired(true);
}
} }
if (ds_renew_id == ds.id) { if (ds_renew_id == ds.id) {
ds.getField('valid_date_to').setPropertity('validator', 'hls303d_record_field_validator'); ds.getField('valid_date_to').setPropertity('validator', 'hls303d_record_field_validator');
......
<?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>
<a:model-delete model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
<batch-apply sourcePath="/parameter/details">
<a:model-insert model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
</batch-apply>
<a:model-update model="hsbc.HSBC100.hsbc_paying_batch_create_return"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
This diff is collapsed.
This diff is collapsed.
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function () { Leaf.onReady(function () {
var record = $('wfl_workflow_deliver_batch_create_ds').getAt(0); var record = $('wfl_workflow_deliver_batch_create_ds').getAt(0);
if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') { //if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') {
if ('${/model/sys_user_employee_rp/record/@role_admin_amount}' == '0' ) {
record.set('recipient_name', '${/model/sys_user_employee_rp/record/@employee_name}'); record.set('recipient_name', '${/model/sys_user_employee_rp/record/@employee_name}');
record.set('recipient_id', '${/model/sys_user_employee_rp/record/@user_id}'); record.set('recipient_id', '${/model/sys_user_employee_rp/record/@user_id}');
record.getField('recipient_name').setReadOnly(true); record.getField('recipient_name').setReadOnly(true);
......
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