Commit 21208ef5 authored by niminmin's avatar niminmin

Merge branch 'feature/保证金功能优化' into develop

parents 48a61cb1 1e43b017
...@@ -80,6 +80,6 @@ ...@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/> <bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/> <bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" queryOperator="="/> <bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field name="reverse_detail_flag" queryExpression="(${@deposit_type}=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and ${@deposit_type} in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;))"/> <bm:query-field name="reverse_detail_flag" queryExpression="(nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;))"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/> <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/> <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/> <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/> <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/> <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/> <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/> <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
p_description=>${@description}, p_description=>${@description},
p_user_id=>${/session/@user_id}, p_user_id=>${/session/@user_id},
p_transaction_id=>${@transaction_id}, p_transaction_id=>${@transaction_id},
p_bp_id => ${@bp_id}, p_bp_id => ${@bp_id_agent_level1},
p_year_flag =>${@year_flag}, p_year_flag =>${@year_flag},
p_quarter_flag =>${@quarter_flag}, p_quarter_flag =>${@quarter_flag},
p_month_flag =>${@month_flag}, p_month_flag =>${@month_flag},
......
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hlcm_cux_deposit_pkg.check_transaction_status_new(
p_transaction_id=>${@transaction_id},
p_user_id=>${/session/@user_id}
);
end;
]]></bm:update-sql>
</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 * from ( select v1.contract_id,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/> <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/> <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/> <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/> <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/> <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/> <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/> <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
...@@ -101,8 +101,8 @@ ...@@ -101,8 +101,8 @@
<bm:field name="deposit_trans_type"/> <bm:field name="deposit_trans_type"/>
<bm:field name="paid_byother_flag"/> <bm:field name="paid_byother_flag"/>
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/> <bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/> <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/> <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/> <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/> <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/> <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/> <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/> <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/> <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" />
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/> <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/> <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/> <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/> <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/> <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/> <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/> <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/> <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" />
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/> <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/> <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/> <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -3,20 +3,13 @@ ...@@ -3,20 +3,13 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from (select decode(cw.write_off_type, select * from (select
'DEPOSIT_ENTRY',
'入账',
'DEPOSIT_TRANSFER',
'划转',
'DEPOSIT_CREDIT',
'抵扣',
'退款') write_off_type_n,
(select cc.contract_number (select cc.contract_number
from con_contract cc from con_contract cc
where cc.contract_id = cw.contract_id) contract_number, where cc.contract_id = cw.contract_id) contract_number,
cw.times, cw.times,
cw.write_off_due_amount, cw.write_off_due_amount,
to_char(cw.creation_date, 'YYYY_MM_DD') creation_date, to_char(cw.creation_date, 'YYYY-MM-DD') creation_date,
(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 = 'DEPOSIT_TRANS_TYPE' where v.code = 'DEPOSIT_TRANS_TYPE'
...@@ -24,7 +17,11 @@ ...@@ -24,7 +17,11 @@
(select t.bp_name (select t.bp_name
from hls_bp_master t, con_contract ct from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_tenant where t.bp_id = ct.bp_id_tenant
and ct.contract_id = cw.contract_id) bp_id_telnet_n and ct.contract_id = cw.contract_id) bp_id_telnet_n,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'CSH513_WRITE_OFF_TYPE'
and v.code_value = cw.write_off_type) write_off_type_n
from csh_write_off cw from csh_write_off cw
where cw.csh_transaction_id=${@transaction_id})v where cw.csh_transaction_id=${@transaction_id})v
#WHERE_CLAUSE# #WHERE_CLAUSE#
......
...@@ -6,33 +6,28 @@ ...@@ -6,33 +6,28 @@
select * select *
from ( from (
select decode(cw.write_off_type, select (select cc.contract_number
'DEPOSIT_ENTRY',
'入账',
'DEPOSIT_TRANSFER',
'划转',
'DEPOSIT_CREDIT',
'抵扣',
'退款')write_off_type_n,
(select cc.contract_number
from con_contract cc from con_contract cc
where cc.contract_id = cw.contract_id) contract_number, where cc.contract_id = ctn.ref_contract_id) contract_number,
cw.times,
cw.write_off_due_amount, ctn.transaction_amount,
to_char(cw.creation_date, 'YYYY_MM_DD') creation_date, to_char(cw.creation_date, 'YYYY-MM-DD') creation_date,
(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 = 'DEPOSIT_TRANS_TYPE' where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = cw.deposit_trans_type) deposit_trans_type_n, and v.code_value = ctn.deposit_trans_type) deposit_trans_type_n,
(select cn.transaction_num ctn.transaction_num transaction_number,
from csh_transaction cn
where cn.transaction_id = cw.csh_transaction_id) transaction_number,
(select t.bp_name (select t.bp_name
from hls_bp_master t, con_contract ct from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_tenant where t.bp_id = ct.bp_id_tenant
and ct.contract_id = cw.contract_id) bp_id_telnet_n and ct.contract_id = ctn.ref_contract_id) bp_id_telnet_n,
from csh_write_off cw (select v.code_value_name
where cw.write_off_id = ${@source_doc_id}) v from sys_code_values_v v
where v.code = 'CSH513_WRITE_OFF_TYPE'
and v.code_value = cw.write_off_type) write_off_type_n
from csh_write_off cw ,csh_transaction ctn
where cw.write_off_id = ${@source_doc_id}
and ctn.transaction_id=cw.csh_transaction_id) v
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/> <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/> <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
<bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/> <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
<bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/> <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
<bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/> <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/> <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
<bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/> <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
<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="deposit_trans_type"/> <bm:field name="deposit_trans_type"/>
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/> <bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/> <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/> <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="source_type"/> <bm:field name="source_type"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/> <bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/> <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/> <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/> <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -7,17 +7,26 @@ ...@@ -7,17 +7,26 @@
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.enabled_flag=&apos;Y&apos;" fetchAll="true" model="basic.csh_payment_method_for_lov" rootPath="payment_method_path"/> <a:model-query defaultWhereClause="t1.enabled_flag=&apos;Y&apos;" fetchAll="true"
model="basic.csh_payment_method_for_lov" rootPath="payment_method_path"/>
<a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="currency"/> <a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="currency"/>
<a:model-query model="csh.CSH531N.csh_query_position" rootPath="result_position"/> <a:model-query model="csh.CSH531N.csh_query_position" rootPath="result_position"/>
<a:model-query defaultWhereClause="t.code = &apos;CSH511_TRANSACTION_TYPE&apos; and t.code_value in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="transaction_type"/> <a:model-query
<a:model-query defaultWhereClause="t.code = &apos;CSH510_RETURN_SELECT&apos; and t.code_value not in (&apos;RETURN&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="returned_flag_rp"/> defaultWhereClause="t.code = &apos;CSH511_TRANSACTION_TYPE&apos; and t.code_value in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;)"
<a:model-query defaultWhereClause="t.code = &apos;CSH510_REVERSE_SELECT&apos; and t.code_value not in (&apos;R&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="reversed_flag_rp"/> fetchAll="true" model="sys.sys_code_values_v" rootPath="transaction_type"/>
<a:model-query
defaultWhereClause="t.code = &apos;CSH510_RETURN_SELECT&apos; and t.code_value not in (&apos;RETURN&apos;)"
fetchAll="true" model="sys.sys_code_values_v" rootPath="returned_flag_rp"/>
<a:model-query
defaultWhereClause="t.code = &apos;CSH510_REVERSE_SELECT&apos; and t.code_value not in (&apos;R&apos;)"
fetchAll="true" model="sys.sys_code_values_v" rootPath="reversed_flag_rp"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="batch_detail_link" <a:link id="batch_detail_link"
url="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_interface.lview"/> url="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_interface.lview"/>
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="check_csh_transaction_status_link_id" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query"
modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//锁表 //锁表
...@@ -55,80 +64,100 @@ ...@@ -55,80 +64,100 @@
$('csh_transaction_receipt_maintain_query_ds').reset(); $('csh_transaction_receipt_maintain_query_ds').reset();
} }
function cus100_receipt_query(){ function cus100_receipt_query() {
$('csh_transaction_receipt_maintain_result_ds').query(); $('csh_transaction_receipt_maintain_result_ds').query();
} }
function cus104_write_off_detail(){
var record = $('csh_transaction_receipt_maintain_result_ds').getSelected()[0];
var status = record.get('confirmed_flag');
var write_off_flag = record.get('write_off_flag');
var readOnly = 'N';
var interfaceQueryFlag = 'Y';
var paid_byother_flag = record.get('paid_byother_flag');
var transaction_type = record.get('transaction_type');
var depositDisplayFlag = 'N';
var advanceDisplayFlag = 'N';
var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
if (approval_flag == 'Y') { function cus104_write_off_detail() {
readOnly = 'Y'; var record = $('csh_transaction_receipt_maintain_result_ds').getSelected()[0];
if (status == 'APPROVED') { var status = record.get('confirmed_flag');
interfaceQueryFlag = 'N'; var write_off_flag = record.get('write_off_flag');
} var readOnly = 'N';
} else { var interfaceQueryFlag = 'Y';
if (write_off_flag == 'FULL') { var paid_byother_flag = record.get('paid_byother_flag');
readOnly = 'Y'; var transaction_type = record.get('transaction_type');
interfaceQueryFlag = 'N'; var depositDisplayFlag = 'N';
} else { var advanceDisplayFlag = 'N';
if(status == 'WF_APPROVING'){ var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
if (approval_flag == 'Y') {
readOnly = 'Y'; readOnly = 'Y';
if (status == 'APPROVED') {
interfaceQueryFlag = 'N';
}
} else {
if (write_off_flag == 'FULL') {
readOnly = 'Y';
interfaceQueryFlag = 'N';
} else {
if (status == 'WF_APPROVING') {
readOnly = 'Y';
}
}
} }
}
}
if (status != 'WF_APPROVING') { if (status != 'WF_APPROVING') {
approval_flag = 'N'; approval_flag = 'N';
} }
if (transaction_type != 'ADVANCE_RECEIPT' && transaction_type != 'DEPOSIT') { if (transaction_type != 'ADVANCE_RECEIPT' && transaction_type != 'DEPOSIT') {
advanceDisplayFlag = 'Y'; advanceDisplayFlag = 'Y';
} else { } else {
if (paid_byother_flag == 'Y') { if (paid_byother_flag == 'Y') {
depositDisplayFlag = 'Y'; depositDisplayFlag = 'Y';
} }
} }
var win = new Leaf.Window({ Leaf.Masker.mask(Ext.getBody(), '正在执行...');
id: 'csh_write_off_upload_window', Leaf.request({
params: { url: $('check_csh_transaction_status_link_id').getUrl(),
transaction_id: record.get('transaction_id'), para: {
depositDisplayFlag: depositDisplayFlag, transaction_id: record.get('transaction_id')
bank_slip_num: record.get('bank_slip_num'), },
company_id: record.get('company_id'), success: function () {
transaction_date: Leaf.formatDate(record.get('transaction_date')), Leaf.Masker.unmask(Ext.getBody());
internal_period_num: record.get('internal_period_num'),
period_name: record.get('period_name'), var win = new Leaf.Window({
bp_bank_account_num: record.get('bp_bank_account_num'), id: 'csh_write_off_upload_window',
bp_bank_account_name: record.get('bp_bank_account_name'), params: {
bp_id: record.get('bp_id'), transaction_id: record.get('transaction_id'),
advanceDisplayFlag: advanceDisplayFlag, depositDisplayFlag: depositDisplayFlag,
readOnly: readOnly, bank_slip_num: record.get('bank_slip_num'),
interfaceQueryFlag: interfaceQueryFlag, company_id: record.get('company_id'),
approval_flag: approval_flag, transaction_date: Leaf.formatDate(record.get('transaction_date')),
internal_period_num: record.get('internal_period_num'),
period_name: record.get('period_name'),
bp_bank_account_num: record.get('bp_bank_account_num'),
bp_bank_account_name: record.get('bp_bank_account_name'),
bp_id: record.get('bp_id'),
advanceDisplayFlag: advanceDisplayFlag,
readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag,
winid: 'csh_write_off_upload_window' winid: 'csh_write_off_upload_window'
}, },
url: $('batch_detail_link').getUrl(), url: $('batch_detail_link').getUrl(),
title: '明细', title: '明细',
fullScreen: true fullScreen: true
}); });
win.on('close', function () { win.on('close', function () {
ds.query(ds.currentPage); ds.query(ds.currentPage);
}); });
} },
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
function csh531n_open_write_off_detail(id, readOnly) { function csh531n_open_write_off_detail(id, readOnly) {
var ds = $('csh_transaction_receipt_maintain_result_ds'); var ds = $('csh_transaction_receipt_maintain_result_ds');
var record = ds.findById(id); var record = ds.findById(id);
var bp_category = record.get('bp_category'); var bp_category = record.get('bp_category');
...@@ -139,37 +168,56 @@ function cus104_write_off_detail(){ ...@@ -139,37 +168,56 @@ function cus104_write_off_detail(){
// if (bp_category == 'AGENT') { // if (bp_category == 'AGENT') {
// depositDisplayFlag = 'Y'; // depositDisplayFlag = 'Y';
// } // }
if (confirmed_flag == 'WF_APPROVING'){ if (confirmed_flag == 'WF_APPROVING') {
interfaceQueryFlag = 'Y'; interfaceQueryFlag = 'Y';
} }
var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N'; var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
var win = new Leaf.Window({ Leaf.Masker.mask(Ext.getBody(), '正在执行...');
id: 'csh_write_off_upload_window', Leaf.request({
params: { url: $('check_csh_transaction_status_link_id').getUrl(),
transaction_id: record.get('transaction_id'), para: {
depositDisplayFlag: depositDisplayFlag, contract_id: record.get('contract_id')
advanceDisplayFlag: advanceDisplayFlag, },
bank_slip_num: record.get('bank_slip_num'), success: function () {
company_id: record.get('company_id'), Leaf.Masker.unmask(Ext.getBody());
transaction_date: Leaf.formatDate(record.get('transaction_date')),
internal_period_num: record.get('internal_period_num'), var win = new Leaf.Window({
period_name: record.get('period_name'), id: 'csh_write_off_upload_window',
bp_bank_account_num: record.get('bp_bank_account_num'), params: {
bp_bank_account_name: record.get('bp_bank_account_name'), transaction_id: record.get('transaction_id'),
bp_id: record.get('bp_id'), depositDisplayFlag: depositDisplayFlag,
readOnly: readOnly, advanceDisplayFlag: advanceDisplayFlag,
approval_flag: approval_flag, bank_slip_num: record.get('bank_slip_num'),
interfaceQueryFlag: interfaceQueryFlag, company_id: record.get('company_id'),
transaction_date: Leaf.formatDate(record.get('transaction_date')),
internal_period_num: record.get('internal_period_num'),
period_name: record.get('period_name'),
bp_bank_account_num: record.get('bp_bank_account_num'),
bp_bank_account_name: record.get('bp_bank_account_name'),
bp_id: record.get('bp_id'),
readOnly: readOnly,
approval_flag: approval_flag,
interfaceQueryFlag: interfaceQueryFlag,
winid: 'csh_write_off_upload_window' winid: 'csh_write_off_upload_window'
},
url: $('batch_detail_link').getUrl(),
title: '明细',
fullScreen: true
});
win.on('close', function () {
ds.query(ds.currentPage);
});
}, },
url: $('batch_detail_link').getUrl(), failure: function () {
title: '明细', Leaf.Masker.unmask(Ext.getBody());
fullScreen: true },
}); error: function () {
win.on('close', function () { Leaf.Masker.unmask(Ext.getBody());
ds.query(ds.currentPage); },
scope: this
}); });
} }
function csh531n_detail_renderer(value, record, name) { function csh531n_detail_renderer(value, record, name) {
...@@ -243,7 +291,9 @@ function cus104_write_off_detail(){ ...@@ -243,7 +291,9 @@ function cus104_write_off_detail(){
<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="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550"
lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="precision" to="precision"/> <a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/> <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
...@@ -258,7 +308,9 @@ function cus104_write_off_detail(){ ...@@ -258,7 +308,9 @@ function cus104_write_off_detail(){
<a:map from="bank_branch_name" to="bank_branch_name"/> <a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_branch_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_branch_name" autoComplete="true" lovGridHeight="350" lovHeight="550"
lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="precision" to="precision"/> <a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/> <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
...@@ -273,7 +325,9 @@ function cus104_write_off_detail(){ ...@@ -273,7 +325,9 @@ function cus104_write_off_detail(){
<a:map from="bank_branch_name" to="bank_branch_name"/> <a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550"
lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="precision" to="precision"/> <a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/> <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
...@@ -294,50 +348,67 @@ function cus104_write_off_detail(){ ...@@ -294,50 +348,67 @@ function cus104_write_off_detail(){
<a:field name="bank_slip_num_to"/> <a:field name="bank_slip_num_to"/>
<a:field name="transaction_date_from" validator="dateValidator"/> <a:field name="transaction_date_from" validator="dateValidator"/>
<a:field name="transaction_date_to" validator="dateValidator"/> <a:field name="transaction_date_to" validator="dateValidator"/>
<a:field name="bank_account_code" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_code" autoCompleteField="bank_account_num" lovGridHeight="350"
lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov"
lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="bank_account_code" to="bank_account_code"/> <a:map from="bank_account_code" to="bank_account_code"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350"
lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov"
lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="bank_account_code" to="bank_account_code_from"/> <a:map from="bank_account_code" to="bank_account_code_from"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_account_from_id"/> <a:field name="bank_account_from_id"/>
<a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num"
lovGridHeight="350" lovHeight="550" lovLabelWidth="90"
lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580"
title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="bank_account_code" to="bank_account_code_to"/> <a:map from="bank_account_code" to="bank_account_code_to"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="transaction_amount_from"/> <a:field name="transaction_amount_from"/>
<a:field name="transaction_amount_to"/> <a:field name="transaction_amount_to"/>
<a:field name="posted_flag_display" displayField="code_value_name" options="posted_flag_ds" returnField="posted_flag" valueField="code_value"/> <a:field name="posted_flag_display" displayField="code_value_name" options="posted_flag_ds"
<a:field name="posted_flag" /> returnField="posted_flag" valueField="code_value"/>
<a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov" lovWidth="500" title="GLD_PERIODS.PERIOD_NAME"> <a:field name="posted_flag"/>
<a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov"
lovWidth="500" title="GLD_PERIODS.PERIOD_NAME">
<a:mapping> <a:mapping>
<a:map from="period_name" to="period_name"/> <a:map from="period_name" to="period_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="user_desc" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="basic.sys_user_for_lov" lovWidth="500" prompt="AUT_TRX_USER_AUTHORIZE.USER_ID" title="员工选择"> <a:field name="user_desc" autoComplete="true" lovGridHeight="300" lovHeight="450"
lovService="basic.sys_user_for_lov" lovWidth="500" prompt="AUT_TRX_USER_AUTHORIZE.USER_ID"
title="员工选择">
<a:mapping> <a:mapping>
<a:map from="description" to="user_desc"/> <a:map from="description" to="user_desc"/>
<a:map from="user_id" to="user_id"/> <a:map from="user_id" to="user_id"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="transaction_type_display" displayField="code_value_name" options="transaction_type_ds" returnField="transaction_type" valueField="code_value"/> <a:field name="transaction_type_display" displayField="code_value_name"
<a:field name="currency_name_from_display" displayField="currency_name" options="currency_ds" returnField="currency_code_from" valueField="currency_code"/> options="transaction_type_ds" returnField="transaction_type" valueField="code_value"/>
<a:field name="currency_name_from_display" displayField="currency_name" options="currency_ds"
returnField="currency_code_from" valueField="currency_code"/>
<a:field name="currency_code_from"/> <a:field name="currency_code_from"/>
<a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds" returnField="currency_code_to" valueField="currency_code"/> <a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds"
returnField="currency_code_to" valueField="currency_code"/>
<a:field name="currency_code_to"/> <a:field name="currency_code_to"/>
<a:field name="transaction_type"/> <a:field name="transaction_type"/>
<a:field name="transaction_category" /> <a:field name="transaction_category"/>
<a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/> <a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds"
<a:field name="not_reversed_flag_r" /> returnField="write_off_flag" valueField="code_value"/>
<a:field name="not_reversed_flag_r"/>
<a:field name="receipt_type"/> <a:field name="receipt_type"/>
<a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds" returnField="receipt_type" valueField="code_value"/> <a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds"
returnField="receipt_type" valueField="code_value"/>
<a:field name="description"/> <a:field name="description"/>
<a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE"> <a:field name="bp_name" lovGridHeight="350" lovHeight="500"
lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
<a:mapping> <a:mapping>
<a:map from="bp_id" to="bp_id"/> <a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/> <a:map from="bp_name" to="bp_name"/>
...@@ -346,21 +417,27 @@ function cus104_write_off_detail(){ ...@@ -346,21 +417,27 @@ function cus104_write_off_detail(){
<!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>--> <!--<a:field name="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>-->
<!--对方账户的--> <!--对方账户的-->
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息"> <a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping> <a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/> <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/> <a:map from="opposite_band_na" to="opposite_band_na"/>
<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="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息"> <a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping> <a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/> <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/> <a:map from="opposite_band_na" to="opposite_band_na"/>
<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="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息"> <a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550"
lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580"
title="对方账户信息">
<a:mapping> <a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/> <a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/> <a:map from="opposite_band_na" to="opposite_band_na"/>
...@@ -373,7 +450,10 @@ function cus104_write_off_detail(){ ...@@ -373,7 +450,10 @@ function cus104_write_off_detail(){
<a:event name="update" handler="csh510_receipt_maintain_update"/> <a:event name="update" handler="csh510_receipt_maintain_update"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT104.csh_transaction_maintain_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true" selectionModel="single"> <a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true"
model="cus_deposit.CUS_DEPOSIT104.csh_transaction_maintain_query"
queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true"
selectionModel="single">
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -384,61 +464,89 @@ function cus104_write_off_detail(){ ...@@ -384,61 +464,89 @@ function cus104_write_off_detail(){
<a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/> <a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/>
<a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/> <a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form labelWidth="120" marginWidth="80" <a:form labelWidth="120" marginWidth="80"
title="查询条件" style="margin-left:20px"> title="查询条件" style="margin-left:20px">
<a:hBox> <a:hBox>
<a:fieldSet column="4" labelWidth="150" title="HLS.QUERY_TITLE"> <a:fieldSet column="4" labelWidth="150" title="HLS.QUERY_TITLE">
<a:datePicker name="transaction_date_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/> <a:datePicker name="transaction_date_from"
<a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/> bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/> prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/>
<a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/> <a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
<a:numberField name="transaction_amount_from"
bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
<a:numberField name="transaction_amount_to"
bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<!--我方账户户名--> <!--我方账户户名-->
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/> <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/> prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/> <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<!--银行流水号--> <!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/> <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名--> <!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/> <a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称--> <!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/> <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号--> <!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/> <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
<a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/> <a:textField name="contract_number" prompt="合同编号"
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/> bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/> <a:textField name="bp_name_n" prompt="代理店"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
</a:fieldSet> </a:fieldSet>
</a:hBox> </a:hBox>
</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="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80" navBar="true" > <a:grid id="csh_transaction_receipt_maintain_grid_ds"
<!--<a:toolBar> bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80"
<a:button click="csh510_export" text="导出"/> navBar="true">
</a:toolBar>--> <!--<a:toolBar>
<a:button click="csh510_export" text="导出"/>
</a:toolBar>-->
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" align="center"/> <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110"
align="center"/>
<!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>--> <!--<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="csh531n_detail_renderer" width="110" align="center"/>-->
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_agent_name" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/> <a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/> <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/> <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT"> <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/> align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name"
</a:column> align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num"
align="center"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT"> <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name"
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/> align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na"
align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num"
align="center"/>
</a:column> </a:column>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:fieldSet> </a:fieldSet>
</a:screenBody> </a:screenBody>
</a:view> </a:view>
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_deposit_return_maintain_ds" <a:textField name="opposite_band_na" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/> prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<a:numberField name="bp_bank_account_num" bindTarget="csh_transaction_deposit_return_maintain_ds" <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="CSH515.CSH_REFUND_AMOUNT"/>--> <!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="CSH515.CSH_REFUND_AMOUNT"/>-->
<!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="银行流水号"/>--> <!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="银行流水号"/>-->
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME" readOnly="true"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME" readOnly="true"/>
<a:textField name="opposite_band_na" bindTarget="csh_transaction_return_wfl_ds" <a:textField name="opposite_band_na" bindTarget="csh_transaction_return_wfl_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME" readOnly="true"/> prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME" readOnly="true"/>
<a:numberField 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"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" 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"/>-->
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_return_link" url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview"/> <a:link id="csh_transaction_return_link" url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview"/>
<a:link id="check_csh_transaction_status_link_id" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query"
modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//锁表 //锁表
...@@ -100,6 +102,39 @@ ...@@ -100,6 +102,39 @@
} }
} }
} }
function cus100_receipt_return (){
var record = $('csh_transaction_receipt_return_maintain_ds').getSelected()[0];
url = $('csh_transaction_return_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&update_flag=true';
Leaf.Masker.mask(Ext.getBody(), '正在执行...');
Leaf.request({
url: $('check_csh_transaction_status_link_id').getUrl(),
para: {
transaction_id: record.get('transaction_id')
},
success: function () {
Leaf.Masker.unmask(Ext.getBody());
new Leaf.Window({
id: 'csh_transaction_deposit_link_winid',
params: {
winId: 'csh_transaction_deposit_link_winid'
},
url: url,
title: '退款详情',
fullScreen: true
}).on('close',function(){
cus100_receipt_query();
});
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -252,6 +287,7 @@ ...@@ -252,6 +287,7 @@
<a:screenTitle/> <a:screenTitle/>
<a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/> <a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/>
<a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/> <a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/>
<a:gridButton click="cus100_receipt_return" text="退款"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form labelWidth="120" marginWidth="80" <a:form labelWidth="120" marginWidth="80"
title="查询条件" style="margin-left:20px"> title="查询条件" style="margin-left:20px">
...@@ -286,11 +322,11 @@ ...@@ -286,11 +322,11 @@
<a:button click="csh510_export" text="导出"/> <a:button click="csh510_export" text="导出"/>
</a:toolBar>--> </a:toolBar>-->
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/> <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_name_n" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/> <a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" width="110" align="center"/> <a:column name="deposit_trans_type_desc" prompt="保证金类型" width="110" align="center"/>
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="可退款金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="unwrite_off_amount" prompt="可退款金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_agent_name" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/> <a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/> <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<!--<a:textField name="times" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="期数"/>--> <!--<a:textField name="times" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="期数"/>-->
<!--<a:textField name="balance" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="保证金剩余余额"/>--> <!--<a:textField name="balance" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="保证金剩余余额"/>-->
<a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/> <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
<a:textField name="bp_agent_name" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/> <a:textField name="bp_name" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/> <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
<a:textField name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/> <a:textField name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
<a:numberField name="unwrite_off_amount" bindTarget="csh_transaction_receipt_maintain_result_ds" <a:numberField name="unwrite_off_amount" bindTarget="csh_transaction_receipt_maintain_result_ds"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<a:column name="bp_id_telnet_n" prompt="承租人" width="150" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" width="150" align="center"/>
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="100"/> <a:column name="deposit_trans_type_n" prompt="保证金类型" width="100"/>
<a:column name="write_off_type_n" prompt="来源方式" width="100" align="center"/> <a:column name="write_off_type_n" prompt="来源方式" width="100" align="center"/>
<a:column name="write_off_due_amount" prompt="收款金额" align="right" width="100"/> <a:column name="transaction_amount" prompt="收款金额" align="right" width="100"/>
<a:column name="creation_date" prompt="操作时间" width="100"/> <a:column name="creation_date" prompt="操作时间" width="100"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/> <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/> <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="bp_name_n" prompt="代理店" align="center"/> <a:column name="bp_name" prompt="代理店" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/> <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/> <a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/> <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
......
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