Commit 2bb7faa5 authored by niminmin's avatar niminmin

Merge branch 'feature/收款核销功能调整' into develop

parents 6f957620 2a537a7b
Pipeline #7030 failed with stages
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from
(SELECT
t.contract_id,
t.company_id,
t.business_type,
t.contract_number,
t.contract_name,
t.document_type,
dt.document_type_desc,
t.document_category,
dt.document_category_desc,
t.bp_id_tenant,
t.lease_execution_date,
b.bp_name,
b.bp_code,
--t.license_number,
TO_CHAR(t.lease_start_date, 'yyyy-mm-dd') lease_start_date,
TO_CHAR(t.lease_end_date, 'yyyy-mm-dd') lease_end_date,
(SELECT h.bp_name FROM hls_bp_master h WHERE h.bp_id = t.unit_id
) AS unit_id_n,
t.unit_id,
TO_CHAR(t.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
t.contract_status,
t.early_termination_profile,
(SELECT
v.code_value_name
FROM
sys_code_values_v v
WHERE
v.code = 'CON500_CONTRACT_STATUS' AND
v.code_value = t.contract_status
) AS contract_status_n,
(SELECT su.description FROM sys_user su WHERE su.user_id = t.owner_user_id
) owner,
t.lease_times,
t.invoice_price,
t.finance_amount,
t.down_payment,
t.deposit,
t.lease_charge,
t.bp_id_agent_level1,
(SELECT
hls.bp_name
FROM
hls_bp_master hls
WHERE
hls.bp_id = t.bp_id_agent_level1
) bp_agent,
t.owner_user_id,
(SELECT
hbt.description
FROM
hls_business_type hbt
WHERE
hbt.enabled_flag = 'Y' AND
hbt.business_type = t.business_type
) business_type_n,
(SELECT
hlc.description
FROM
hls_lease_channel hlc
WHERE
hlc.lease_channel = t.lease_channel AND
hlc.enabled_flag = 'Y'
) lease_channel_n,
t.division,
(SELECT
t2.description
FROM
hls_division t2
WHERE
t2.enabled_flag = 'Y' AND
t2.division = t.division
) division_n
FROM
con_contract t,
hls_bp_master b,
hls_document_type_v dt
WHERE
t.bp_id_tenant = b.bp_id(+) AND
t.contract_status = 'INCEPT' AND
t.data_class = 'NORMAL' AND
dt.document_type(+) = t.document_type
and exists (select 1
from csh_write_off cwo, gld_write_off gwo
where cwo.contract_id = t.contract_id
and cwo.write_off_id = gwo.csh_write_off_id
and cwo.cf_item = 9
and gwo.cf_item = 1)
) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_id" queryExpression="t1.contract_id = ${@contract_id}"/>
<bm:query-field name="unit_id" queryExpression="t1.unit_id = ${@unit_id}"/>
<bm:query-field name="date_from" datatype="java.lang.String" queryexpression="t1.inception_of_lease &gt;= ${@date_from}"/>
<bm:query-field name="date_to" datatype="java.lang.String" queryexpression="t1.inception_of_lease &lt;= ${@date_to}"/>
<bm:query-field name="lease_end_date_from" datatype="java.lang.String" queryexpression="t1.lease_end_date &gt;= ${@lease_end_date_from}"/>
<bm:query-field name="lease_end_date_to" datatype="java.lang.String" queryexpression="t1.lease_end_date &lt;= ${@lease_end_date_to}"/>
<bm:query-field name="contract_number" datatype="java.lang.String" queryexpression="upper(t1.contract_number) like &apos;%&apos; || upper(${@contract_number}) || &apos;%&apos;"/>
<!-- <bm:query-field name="license_number" datatype="java.lang.String" queryexpression="upper(t1.license_number) like &apos;%&apos; || upper(${@license_number}) || &apos;%&apos;"/> -->
<bm:query-field name="contract_name" datatype="java.lang.String" queryexpression="t1.contract_name like &apos;%&apos; || ${@contract_name} || &apos;%&apos;"/>
<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>
<bm:query-field name="bp_id_agent_level1" queryExpression="t1.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
<bm:query-field name="bp_code" datatype="java.lang.String" queryexpression="t1.bp_code=${@bp_code}"/>
<bm:query-field name="document_category" datatype="java.lang.String" queryexpression="t1.document_category=${@document_category}"/>
<bm:query-field name="document_type" datatype="java.lang.String" queryexpression="t1.document_type=${@document_type}"/>
<bm:query-field name="overdue_status" datatype="java.lang.String" queryexpression="t1.overdue_status=${@overdue_status}"/>
<bm:query-field name="received_times" queryExpression="t1.received_times = ${@received_times}"/>
<bm:query-field name="division" queryExpression="t1.division = ${@division}"/>
<bm:query-field name="contract_status" queryExpression="t1.contract_status = ${@contract_status}"/>
<bm:query-field name="lease_execution_date_from" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &gt;= ${@lease_execution_date_from}"/>
<bm:query-field name="lease_execution_date_to" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &lt;= ${@lease_execution_date_to}"/>
</bm:query-fields>
<bm:features>
<!-- EXISTS-->
<!-- (SELECT-->
<!-- 1-->
<!-- FROM-->
<!-- sys_user u-->
<!-- WHERE-->
<!-- u.bp_category = 'AGENT' AND-->
<!-- u.user_id =${/session/@user_id}-->
<!-- ) AND-->
<!-- AND t.owner_user_id = ${/session/@user_id}-->
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="record_id" dataType="java.lang.Long" input="false" output="true"
outputPath="@record_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.create_rent_trans_pently_hd(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_id} );
END;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.cancel_rent_trans_pently(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_id} );
END;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.delete_rent_trans_pently(
p_user_id=>${/session/@user_id},
p_record_id=>${@record_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" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.submit_rent_trans_pently(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_id} );
END;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.update_rent_trans_pently(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_id},
p_csh_write_off_id=>${@write_off_id});
END;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
cus_rent_trans_pently_pkg.check_rent_trans_pently(p_contract_id=>${@contract_id},
p_user_id=>${/session/@user_id},
p_record_id=>${@record_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" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (
Select cwo.cashflow_id,
t.transaction_num,
cwo.write_off_id,
(Select v.code_value_name
From sys_code_values_v v
Where v.code = 'RECEIPT_TYPE'
And v.code_value = t.receipt_type) transaction_type,
c.contract_id,
cwo.times,
ccc.cf_item,
(Select h.description
From hls_cashflow_item h
Where h.cf_item = ccc.cf_item) cf_item_n,
--代理店简称
(Select h.extra_nam
From hls_bp_master h
Where h.bp_id = c.bp_id_agent_level1) extra_nam,
--合同编号
c.contract_number,
--机号
(Select ccli.machine_number
From con_contract_lease_item ccli
Where ccli.contract_id = c.contract_id) machine_number,
--承租人编号,名称,身份证号
h.bp_code bp_id_tenant,
h.bp_name,
decode(h.bp_class, 'NP', h.id_card_no, h.social_code) id_card_no,
--合同总额
nvl(c.down_payment, 0) + nvl(c.total_rental, 0) total_amount,
to_char(ccc.due_date,'yyyy-mm-dd') due_date,
--收款日
to_char(t.transaction_date,'yyyy-mm-dd') transaction_date,
(ccc.due_amount - nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount,
to_char(cwo.write_off_date,'yyyy-mm-dd')write_off_date,
--实收金额
cwo.write_off_due_amount received_amount,
(ccc.due_amount - nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= cwo.creation_date),
0)) As unreceived_amount
From con_contract_cashflow ccc,
con_contract c,
hls_bp_master h,
csh_write_off cwo,
csh_transaction t
Where cwo.cashflow_id = ccc.cashflow_id
And ccc.contract_id = c.contract_id
And cwo.csh_transaction_id = t.transaction_id
And nvl(cwo.reversed_flag, 'N') = 'N'
And h.bp_id = c.bp_id_tenant
-- And cwo.write_off_type In ('RECEIPT_CREDIT', 'DEPOSIT_CREDIT')
And ccc.cf_item =9
And ccc.cf_status = 'RELEASE'
And cwo.write_off_due_amount > 0
Order By c.contract_id,
ccc.times,
ccc.cf_item,
t.transaction_date,
cwo.write_off_id ) t
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_id" queryExpression="t.contract_id = ${@contract_id}"/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (
select ptw.gld_cf_item,
(Select h.description
From hls_cashflow_item h
Where h.cf_item = ptw.gld_cf_item) gld_cf_item_n,
ptw.gld_times,
ptw.gld_write_off_id,
ptw.csh_write_off_id,
ptw.gld_write_off_amount,
ctp.record_id
from
penalty_trans_write_off ptw,
cus_rent_trans_pently_hd ctp
Where ptw.trans_pently_hd_id=ctp.record_id
and ptw.gld_write_off_amount>0
) t
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="record_id" queryExpression="t.record_id = ${@record_id}"/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from
(SELECT
t.contract_id,
t.company_id,
t.business_type,
t.contract_number,
t.contract_name,
t.document_type,
dt.document_type_desc,
t.document_category,
dt.document_category_desc,
t.bp_id_tenant,
t.lease_execution_date,
b.bp_name,
b.bp_code,
--t.license_number,
TO_CHAR(t.lease_start_date, 'yyyy-mm-dd') lease_start_date,
TO_CHAR(t.lease_end_date, 'yyyy-mm-dd') lease_end_date,
(SELECT h.bp_name FROM hls_bp_master h WHERE h.bp_id = t.unit_id
) AS unit_id_n,
t.unit_id,
TO_CHAR(t.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
t.contract_status,
t.early_termination_profile,
(SELECT
v.code_value_name
FROM
sys_code_values_v v
WHERE
v.code = 'CON500_CONTRACT_STATUS' AND
v.code_value = t.contract_status
) AS contract_status_n,
(SELECT su.description FROM sys_user su WHERE su.user_id = t.owner_user_id
) owner,
t.lease_times,
t.invoice_price,
t.finance_amount,
t.down_payment,
t.deposit,
t.lease_charge,
t.bp_id_agent_level1,
(SELECT
hls.bp_name
FROM
hls_bp_master hls
WHERE
hls.bp_id = t.bp_id_agent_level1
) bp_agent,
t.owner_user_id,
(SELECT
hbt.description
FROM
hls_business_type hbt
WHERE
hbt.enabled_flag = 'Y' AND
hbt.business_type = t.business_type
) business_type_n,
(SELECT
hlc.description
FROM
hls_lease_channel hlc
WHERE
hlc.lease_channel = t.lease_channel AND
hlc.enabled_flag = 'Y'
) lease_channel_n,
t.division,
(SELECT
t2.description
FROM
hls_division t2
WHERE
t2.enabled_flag = 'Y' AND
t2.division = t.division
) division_n,
tpd.status,
decode(tpd.status,'NEW','新建','REJECT','审批拒绝','APPROVING','审批中','APPROVED','审批通过','CANCEL','取消')status_n,
tpd.apply_number,
tpd.record_id,
TO_CHAR(tpd.apply_date, 'yyyy-mm-dd') apply_date,
(SELECT su.description FROM sys_user su WHERE su.user_id = tpd.created_by
) applyer,
tpd.description,
nvl((select sum(nvl(ccw.received_amount, 0))
from con_contract_cashflow ccw
where ccw.contract_id = t.contract_id
and ccw.cf_item = 9),
0) business_sum_penalty,
nvl((select sum(gw.write_off_amount)
from gld_write_off gw
where gw.contract_id = t.contract_id
and gw.cf_item = 9),
0)account_sum_penalty
FROM
con_contract t,
hls_bp_master b,
hls_document_type_v dt,
cus_rent_trans_pently_hd tpd
WHERE
t.bp_id_tenant = b.bp_id(+) AND
dt.document_type(+) = t.document_type
and tpd.contract_id=t.contract_id
) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_id" queryExpression="t1.contract_id = ${@contract_id}"/>
<bm:query-field name="record_id" queryExpression="t1.record_id = ${@record_id}"/>
<bm:query-field name="unit_id" queryExpression="t1.unit_id = ${@unit_id}"/>
<bm:query-field name="date_from" datatype="java.lang.String"
queryexpression="t1.inception_of_lease &gt;= ${@date_from}"/>
<bm:query-field name="date_to" datatype="java.lang.String"
queryexpression="t1.inception_of_lease &lt;= ${@date_to}"/>
<bm:query-field name="lease_end_date_from" datatype="java.lang.String"
queryexpression="t1.lease_end_date &gt;= ${@lease_end_date_from}"/>
<bm:query-field name="lease_end_date_to" datatype="java.lang.String"
queryexpression="t1.lease_end_date &lt;= ${@lease_end_date_to}"/>
<bm:query-field name="contract_number" datatype="java.lang.String"
queryexpression="upper(t1.contract_number) like &apos;%&apos; || upper(${@contract_number}) || &apos;%&apos;"/>
<!-- <bm:query-field name="license_number" datatype="java.lang.String" queryexpression="upper(t1.license_number) like &apos;%&apos; || upper(${@license_number}) || &apos;%&apos;"/> -->
<bm:query-field name="contract_name" datatype="java.lang.String"
queryexpression="t1.contract_name like &apos;%&apos; || ${@contract_name} || &apos;%&apos;"/>
<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>
<bm:query-field name="bp_id_agent_level1" queryExpression="t1.bp_id_agent_level1 = ${@bp_id_agent_level1}"/>
<bm:query-field name="bp_code" datatype="java.lang.String" queryexpression="t1.bp_code=${@bp_code}"/>
<bm:query-field name="document_category" datatype="java.lang.String"
queryexpression="t1.document_category=${@document_category}"/>
<bm:query-field name="document_type" datatype="java.lang.String"
queryexpression="t1.document_type=${@document_type}"/>
<bm:query-field name="overdue_status" datatype="java.lang.String"
queryexpression="t1.overdue_status=${@overdue_status}"/>
<bm:query-field name="received_times" queryExpression="t1.received_times = ${@received_times}"/>
<bm:query-field name="division" queryExpression="t1.division = ${@division}"/>
<bm:query-field name="contract_status" queryExpression="t1.contract_status = ${@contract_status}"/>
<bm:query-field name="status" queryExpression="t1.status = ${@status}"/>
<bm:query-field name="apply_number" datatype="java.lang.String"
queryexpression="upper(t1.apply_number) like &apos;%&apos; || upper(${@apply_number}) || &apos;%&apos;"/>
</bm:query-fields>
<bm:features>
<!-- EXISTS-->
<!-- (SELECT-->
<!-- 1-->
<!-- FROM-->
<!-- sys_user u-->
<!-- WHERE-->
<!-- u.bp_category = 'AGENT' AND-->
<!-- u.user_id =${/session/@user_id}-->
<!-- ) AND-->
<!-- AND t.owner_user_id = ${/session/@user_id}-->
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
</bm:model>
...@@ -33,7 +33,12 @@ ...@@ -33,7 +33,12 @@
from hls_bp_master_bank_account a from hls_bp_master_bank_account a
where a.bank_account_id = ct.bp_bank_account_id) bp_bank_account_code, where a.bank_account_id = ct.bp_bank_account_id) bp_bank_account_code,
cr.bp_bank_account_name, cr.bp_bank_account_name,
cr.notes description cr.notes description,
cr.csh_return_atm_id,
cr.csh_return_bp_id,
(select a.bp_name
from hls_bp_master a
where a.bp_id = cr.csh_return_bp_id) csh_return_bp_name
from csh_transaction ct, csh_transaction_return cr from csh_transaction ct, csh_transaction_return cr
where ct.transaction_id = cr.transaction_id where ct.transaction_id = cr.transaction_id
)v )v
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select csh_return_list_s.nextval return_list_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="return_list_id"/>
</bm:fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-15 下午01:13:07
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V" needAccessControl="false">
<bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
<bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" prompt="商业伙伴类型"/>
<bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
<!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
</bm:fields>
<bm:features>
<f:standard-who/>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
<bm:query-fields>
<bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field field="bp_code" queryOperator="like"/>
<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
<bm:data-filter name="query" expression="(t1.bp_category in ('AGENT','VENDER'))"/>
</bm:data-filters>
</bm:model>
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
p_bp_bank_account_name =>${@bp_bank_account_name}, p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na}, p_opposite_band_na =>${@opposite_band_na},
p_bp_bank_account_num =>${@bp_bank_account_num}, p_bp_bank_account_num =>${@bp_bank_account_num},
p_description =>${@description} p_description =>${@description},
p_csh_return_atm_id=>${@csh_return_atm_id},
p_csh_return_bp_id=>${@csh_return_bp_id}
); );
end;]]></bm:update-sql> end;]]></bm:update-sql>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niminmin
$Date: 2020-6-24
$Revision: 1.0
$Purpose: 会计核销租金转罚详情
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<a:link id="cancel_rent_trans_penalty_change_link" model="cont.CON7000.create_rent_trans_penalty_change"
modelaction="update"/>
<a:link id="submit_rent_trans_penalty_change_link" model="cont.CON7000.rent_trans_penalty_submit"
modelaction="update"/>
<a:link id="update_rent_trans_penalty_link"
url="${/request/@context_path}/modules/cont/CON7000/con_rent_trans_penalty_deal.lsc"/>
<script type="text/javascript"><![CDATA[
function con7000_back() {
$('${/parameter/@winId}').close();
}
function con7000_save() {
debugger;
var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0),
business_sum_penalty = hd_record.get('business_sum_penalty'),
account_sum_penalty = hd_record.get('account_sum_penalty');
var csh_recordAll = $('con7000_csh_write_off_ds').getSelected();
var param = {};
var saveData = [];
param['contract_id'] = hd_record.get('contract_id');
param['record_id'] = hd_record.get('record_id');
if (csh_recordAll.length < 1) {
Leaf.showMessage('提示', '请勾选营业核销记录');
return;
}
for (var i = 0; i < csh_recordAll.length; i++) {
var csh_record;
csh_record = csh_recordAll[i];
csh_record.set('_status', 'insert');
csh_record.set('record_id', hd_record.get('record_id'));
saveData.push(csh_record.data);
}
param['details'] = saveData;
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('update_rent_trans_penalty_link').getUrl(),
para: param,
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
$('con7000_gld_write_off_ds').query();
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
function con7000_submit() {
var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0);
var gld_record = $('con_rent_trans_penalty_hd_ds').getAll();
if (gld_record.length < 1) {
Leaf.showMessage('提示', '罚息调整数据不能为空!');
return;
}
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交变更?', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('submit_rent_trans_penalty_change_link').getUrl(),
para: {
contract_id: hd_record.get('contract_id'),
record_id: hd_record.get('record_id')
},
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
$('${/parameter/@winId}').close();
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
});
}
function con7000_cancel() {
var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0);
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更?', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('cancel_rent_trans_penalty_change_link').getUrl(),
para: {
contract_id: hd_record.get('contract_id'),
record_id: hd_record.get('record_id')
},
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
$('${/parameter/@winId}').close();
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
});
}
]]></script>
<a:dataSets>
<a:dataSet id="con_rent_trans_penalty_hd_ds" autoPageSize="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_modify_query"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_modify_query/query?record_id=${/parameter/@record_id}">
<!-- <a:fields>-->
<!-- <a:field name="description" required="true"/>-->
<!-- </a:fields>-->
</a:dataSet>
<a:dataSet id="con7000_csh_write_off_ds" fetchAll="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_csh_write_off"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_csh_write_off/query?contract_id=${/parameter/@contract_id}"
selectable="true"/>
<a:dataSet id="con7000_gld_write_off_ds" fetchAll="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_gld_write_off"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_gld_write_off/query?record_id=${/parameter/@record_id}"/>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:gridButton id="con7000_back_id" click="con7000_back" text="HLS.EXIT"/>
<a:gridButton id="con7000_save_id" click="con7000_save" text="保存"/>
<a:gridButton id="con7000_submit_id" click="con7000_submit" text="提交审批"/>
<a:gridButton id="con7000_cancel_id" click="con7000_cancel" text="取消变更"/>
</a:screenTopToolbar>
<a:form labelWidth="100" marginWidth="200" title="合同信息">
<a:box column="4" labelWidth="115">
<a:textField name="apply_number" prompt="申请编号" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="contract_number" prompt="合同编号" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="contract_name" prompt="合同名称" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="bp_name" prompt="承租人名称" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
</a:box>
<a:box column="3" labelWidth="115">
<a:textField name="bp_agent" prompt="代理店" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="apply_date" prompt="申请时间" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="applyer" prompt="申请人" readOnly="true" bindTarget="con_rent_trans_penalty_hd_ds"/>
</a:box>
<a:box column="1">
<a:textArea name="description" bindTarget="con_rent_trans_penalty_hd_ds" prompt="变更理由及说明"
marginWidth="300"/>
</a:box>
</a:form>
<a:tabPanel marginHeight="150" marginWidth="170">
<a:tabs>
<a:tab prompt="营业违约金核销明细" width="150">
<a:grid id="con7000_csh_write_off_grid" bindTarget="con7000_csh_write_off_ds" marginHeight="130"
marginWidth="200" navBar="true">
<a:columns>
<a:column name="times" prompt="回数" width="70" align="center"/>
<a:column name="due_date" prompt="预定支付日" width="120" align="center"
renderer="Leaf.formatDate"/>
<a:column name="due_amount" prompt="应收金额" width="100" align="right"/>
<a:column name="cf_item_n" prompt="应收项目" width="100" align="center"/>
<a:column name="transaction_type" prompt="收款类型" width="120" align="center"/>
<a:column name="transaction_date" prompt="实际收款日" width="120" align="center"/>
<a:column name="transaction_num" prompt="现金事务编号" width="120" align="center"/>
<a:column name="write_off_date" prompt="核销日期" width="120" align="center"/>
<a:column name="received_amount" prompt="实收金额" width="120" align="center"/>
<a:column name="unreceived_amount" prompt="未收金额" width="116" align="center"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
<a:tabPanel marginHeight="150" marginWidth="170">
<a:tabs>
<a:tab prompt="营业违-对应-会计核销明细" width="180">
<a:grid id="con7000_gld_write_off_grid" bindTarget="con7000_gld_write_off_ds" marginHeight="300"
marginWidth="200" navBar="true">
<a:columns>
<a:column name="gld_times" prompt="回数" width="120" align="center"/>
<a:column name="gld_cf_item_n" prompt="应收项目" width="340" align="center"/>
<a:column name="gld_write_off_amount" prompt="会计核销金额" width="200" align="center"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
</a:screenBody>
</a:view>
</a:screen>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niminmin
$Date: 2020-6-24
$Revision: 1.0
$Purpose: 会计核销租金转罚只读页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
function con7000_back() {
$('${/parameter/@winId}').close();
}
]]></script>
<a:dataSets>
<a:dataSet id="con_rent_trans_penalty_hd_ds" autoPageSize="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_modify_query"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_modify_query/query?record_id=${/parameter/@record_id}">
</a:dataSet>
<a:dataSet id="con7000_csh_write_off_ds" autoPageSize="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_csh_write_off"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_csh_write_off/query?contract_id=${/parameter/@contract_id}"
/>
<a:dataSet id="con7000_gld_write_off_ds" autoPageSize="true" autoQuery="true"
model="cont.CON7001.con_rent_trans_penalty_gld_write_off"
queryUrl="${/request/@context_path}/autocrud/cont.CON7001.con_rent_trans_penalty_gld_write_off/query?record_id=${/parameter/@record_id}"/>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:gridButton id="con7000_back_id" click="con7000_back" text="HLS.EXIT"/>
</a:screenTopToolbar>
<a:form labelWidth="100" marginWidth="200" title="合同信息">
<a:box column="4" labelWidth="115">
<a:textField name="apply_number" prompt="申请编号" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="contract_number" prompt="合同编号" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="contract_name" prompt="合同名称" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="bp_name" prompt="承租人名称" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
</a:box>
<a:box column="3" labelWidth="115">
<a:textField name="bp_agent" prompt="代理店" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="apply_date" prompt="申请时间" readOnly="true"
bindTarget="con_rent_trans_penalty_hd_ds"/>
<a:textField name="applyer" prompt="申请人" readOnly="true" bindTarget="con_rent_trans_penalty_hd_ds"/>
</a:box>
<a:box column="1">
<a:textArea name="description" bindTarget="con_rent_trans_penalty_hd_ds" prompt="变更理由及说明"
marginWidth="300" readOnly="true"/>
</a:box>
</a:form>
<a:tabPanel marginHeight="150" marginWidth="170">
<a:tabs>
<a:tab prompt="营业违约金核销明细" width="150">
<a:grid id="con7000_csh_write_off_grid" bindTarget="con7000_csh_write_off_ds" marginHeight="130"
marginWidth="200" navBar="true">
<a:columns>
<a:column name="times" prompt="回数" width="70" align="center"/>
<a:column name="due_date" prompt="预定支付日" width="120" align="center"
renderer="Leaf.formatDate"/>
<a:column name="due_amount" prompt="应收金额" width="100" align="right"/>
<a:column name="cf_item_n" prompt="应收项目" width="100" align="center"/>
<a:column name="transaction_type" prompt="收款类型" width="120" align="center"/>
<a:column name="transaction_date" prompt="实际收款日" width="120" align="center"/>
<a:column name="transaction_num" prompt="现金事务编号" width="120" align="center"/>
<a:column name="write_off_date" prompt="核销日期" width="120" align="center"/>
<a:column name="received_amount" prompt="实收金额" width="120" align="center"/>
<a:column name="unreceived_amount" prompt="未收金额" width="116" align="center"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
<a:tabPanel marginHeight="150" marginWidth="170">
<a:tabs>
<a:tab prompt="营业违-对应-会计核销明细" width="180">
<a:grid id="con7000_gld_write_off_grid" bindTarget="con7000_gld_write_off_ds" marginHeight="200"
marginWidth="200" navBar="true">
<a:columns>
<a:column name="gld_times" prompt="回数" width="120" align="center"/>
<a:column name="gld_cf_item" prompt="应收项目" width="340" align="center"/>
<a:column name="gld_write_off_amount" prompt="会计核销金额" width="200" align="center"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
</a:screenBody>
</a:view>
</a:screen>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niminmin
$Date: 2020-6-24
$Revision: 1.0
$Purpose: 会计核销租金转罚创建页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="basic.hls_division_for_lov" rootPath="hls_division_path"/>
</a:init-procedure>
<a:view>
<a:link id="con_rent_trans_penalty_detail_link" url="${/request/@context_path}/modules/cont/CON7000/con_rent_trans_penalty_create_detail.lview"/>
<a:link id="create_rent_trans_penalty_change_link" model="cont.CON7000.create_rent_trans_penalty_change" modelaction="execute"/>
<script type="text/javascript"><![CDATA[
function contractQueryScreen_query() {
$('contractQueryScreen_mainDs').query();
}
function contractQueryScreen_reset() {
$('contractQueryScreen_paraDs').reset();
}
function contractQueryScreen_add() {
debugger;
var records = $('contractQueryScreen_mainDs').getSelected();
var record = records[0],
contract_id = record.get('contract_id');
Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在违约金调整期间无法进行后续操作,请谨慎操作!!!如果需要取消违约金调整,请一定点击取消按钮!!!</span>', function () {
Leaf.Masker.mask(Ext.getBody());
Leaf.request({
url: $('create_rent_trans_penalty_change_link').getUrl(),
para: {
contract_id: contract_id
},
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
var url = $('con_rent_trans_penalty_detail_link').getUrl();
var param = record.data;
param['record_id'] = res.result.record_id;
param['contract_id'] = contract_id;
param['winId'] = 'con_rent_trans_penalty_detail_link_winid';
new Leaf.Window({
id: 'con_rent_trans_penalty_detail_link_winid',
params:param,
url: url,
title: '罚息调整',
fullScreen: true
}).on('close',function(){
contractQueryScreen_query()
});
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
// $('et_create').enable(); //按钮启用
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
// $('et_create').enable(); //按钮启用
},
scope: this
});
}, function () {
// $('et_create').enable(); //按钮启用
}, 300, 150);
}
]]></script>
<a:dataSets>
<a:dataSet id="yes_or_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
<a:dataSet id="hls_division_ds">
<a:datas dataSource="/model/hls_division_path"/>
</a:dataSet>
<a:dataSet id="contractQueryScreen_paraDs">
<a:fields>
<a:field name="contract_number" typeCase="upper"/>
<a:field name="contract_name"/>
<a:field name="date_from"/>
<a:field name="date_to"/>
<a:field name="bp_id_tenant"/>
<a:field name="bp_name" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=TENANT" lovWidth="700" title="承租人">
<a:mapping>
<a:map from="bp_id" to="bp_id_tenant"/>
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<!--代理商-->
<a:field name="bp_id_agent_level1"/>
<a:field name="bp_agent" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=AGENT" lovWidth="700" title="代理商">
<a:mapping>
<a:map from="bp_id" to="bp_id_agent_level1"/>
<a:map from="bp_name" to="bp_agent"/>
</a:mapping>
</a:field>
<!--产品线-->
<a:field name="division_n" displayField="description" options="hls_division_ds" returnField="division" valueField="division"/>
<a:field name="contract_status"/>
<a:field name="contract_status_desc" displayField="code_value_name" options="contract_status_ds" returnField="contract_status" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="contractQueryScreen_mainDs" autoQuery="true" fetchAll="true" autoPageSize="true" model="cont.CON7000.con_rent_trans_penalty_query" queryDataSet="contractQueryScreen_paraDs" selectable="true" selectionModel="single">
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
<a:gridButton id="et_create" click="contractQueryScreen_add" text="HLS.CREATE"/>
</a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
</a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="130" marginWidth="40" navBar="true">
<a:columns>
<a:column name="contract_number" prompt="合同编号" width="120" align="center"/>
<a:column name="contract_name" prompt="合同名称" width="340" align="center"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="center"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="center"/>
<a:column name="division_n" prompt="租赁物" width="120" align="center"/>
<a:column name="lease_start_date" prompt="起租日" width="120" align="center"/>
<a:column name="contract_status_n" prompt="合同状态" width="120" align="center"/>
</a:columns>
</a:grid>
</a:screenBody>
</a:view>
</a:screen>
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
<a:model-delete model="cont.CON7000.create_rent_trans_penalty_change" trace="true"/>
<batch-apply sourcePath="/parameter/details">
<a:model-insert model="cont.CON7000.rent_trans_penalty_submit" trace="true"/>
</batch-apply>
<a:model-execute model="cont.CON7000.rent_trans_penalty_submit" trace="true"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niminmin
$Date: 2020-6-24
$Revision: 1.0
$Purpose: 会计核销租金转罚维护入口页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<a:link id="con_rent_trans_penalty_detail_link"
url="${/request/@context_path}/modules/cont/CON7000/con_rent_trans_penalty_create_detail.lview"/>
<a:link id="con_rent_trans_penalty_detail_readonly_link"
url="${/request/@context_path}/modules/cont/CON7000/con_rent_trans_penalty_create_detail_readonly.lview"/>
<script type="text/javascript"><![CDATA[
function contractQueryScreen_query() {
$('contractQueryScreen_mainDs').query();
}
function contractQueryScreen_reset() {
$('contractQueryScreen_paraDs').reset();
}
function seedetail_apply_num(value, record, name) {
if (record.get('record_id')) {
var url;
if (record.get('status') == 'NEW') {
url = $('con_rent_trans_penalty_detail_link').getUrl() + '?record_id=' + record.get('record_id') + '&contract_id=' + record.get('contract_id');
} else {
url = $('con_rent_trans_penalty_detail_readonly_link').getUrl() + '?record_id=' + record.get('record_id') + '&contract_id=' + record.get('contract_id');
}
return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
}
}
function openWindow(url) {
new Leaf.Window({
id: 'con_rent_trans_penalty_detail_link_winid',
params: {
winId: 'con_rent_trans_penalty_detail_link_winid'
},
url: url,
title: '违约金调整维护',
fullScreen: true
}).on('close', function () {
contractQueryScreen_query();
});
}
]]></script>
<a:dataSets>
<a:dataSet id="yes_or_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="apply_status_ds">
<a:datas>
<a:record code_value="NEW" code_value_name="新建"/>
<a:record code_value="CANCEL" code_value_name="取消"/>
<a:record code_value="REJECT" code_value_name="审批拒绝"/>
<a:record code_value="APPROVED" code_value_name="审批通过"/>
<a:record code_value="APPROVING" code_value_name="审批中"/>
</a:datas>
</a:dataSet>
<a:dataSet id="contractQueryScreen_paraDs">
<a:fields>
<a:field name="contract_number" typeCase="upper"/>
<a:field name="apply_number" typeCase="upper"/>
<a:field name="contract_name"/>
<a:field name="date_from"/>
<a:field name="date_to"/>
<a:field name="bp_id_tenant"/>
<a:field name="bp_name" lovGridHeight="330" lovHeight="470" lovLabelWidth="120"
lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=TENANT" lovWidth="700"
title="承租人">
<a:mapping>
<a:map from="bp_id" to="bp_id_tenant"/>
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<!--代理商-->
<a:field name="bp_id_agent_level1"/>
<a:field name="bp_agent" lovGridHeight="330" lovHeight="470" lovLabelWidth="120"
lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=AGENT" lovWidth="700"
title="代理商">
<a:mapping>
<a:map from="bp_id" to="bp_id_agent_level1"/>
<a:map from="bp_name" to="bp_agent"/>
</a:mapping>
</a:field>
<a:field name="status"/>
<a:field name="status_n" displayField="code_value_name" options="apply_status_ds"
returnField="status" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="contractQueryScreen_mainDs" autoQuery="true" fetchAll="true" autoPageSize="true"
model="cont.CON7001.con_rent_trans_penalty_modify_query"
queryDataSet="contractQueryScreen_paraDs" selectable="true" selectionModel="single">
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
</a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="apply_number" bindTarget="contractQueryScreen_paraDs" prompt="申请编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<a:comboBox name="status_n" bindTarget="contractQueryScreen_paraDs" prompt="申请状态"/>
</a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="150"
marginWidth="40" navBar="true">
<a:columns>
<a:column name="apply_number" prompt="申请编号" width="120" align="center"
renderer="seedetail_apply_num"/>
<a:column name="contract_number" prompt="合同编号" width="120" align="center"/>
<a:column name="contract_name" prompt="合同名称" width="340" align="center"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="center"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="center"/>
<a:column name="lease_start_date" prompt="起租日" width="120" align="center"/>
<a:column name="status_n" prompt="申请状态" width="120" align="center"/>
</a:columns>
</a:grid>
</a:screenBody>
</a:view>
</a:screen>
...@@ -8,14 +8,16 @@ ...@@ -8,14 +8,16 @@
<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 model="basic.hls_sys_time_default_value" rootPath="sys_time_default_value_path"/> <a:model-query model="basic.hls_sys_time_default_value" rootPath="sys_time_default_value_path"/>
<a:model-query model="cus_deposit.CUS_DEPOSIT106.get_csh_return_list_id" rootPath="csh_return_list_id"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="cus_deposit1060_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="csh560_save_transaction_return_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start" <a:link id="csh560_save_transaction_return_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start"
modelaction="update"/> modelaction="update"/>
<a:link id="csh560_start_wfl_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start" <a:link id="csh560_start_wfl_link" model="cus_deposit.CUS_DEPOSIT106.return_workflow_start"
modelaction="execute"/> modelaction="execute"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
var csh_return_atm_id = '${/model/csh_return_list_id/record/@return_list_id}';
function csh515_return_back() { function csh515_return_back() {
$('${/parameter/@winId}').close(); $('${/parameter/@winId}').close();
} }
...@@ -67,7 +69,6 @@ ...@@ -67,7 +69,6 @@
return; return;
} }
Leaf.showConfirm('提示', '确定退款?', function okFun() { Leaf.showConfirm('提示', '确定退款?', function okFun() {
Leaf.request({ Leaf.request({
url: $('csh560_save_transaction_return_link').getUrl(), url: $('csh560_save_transaction_return_link').getUrl(),
para: { para: {
...@@ -77,7 +78,9 @@ ...@@ -77,7 +78,9 @@
bp_bank_account_name: record.get('bp_bank_account_name'), bp_bank_account_name: record.get('bp_bank_account_name'),
opposite_band_na: record.get('opposite_band_na'), opposite_band_na: record.get('opposite_band_na'),
bp_bank_account_num: record.get('bp_bank_account_num'), bp_bank_account_num: record.get('bp_bank_account_num'),
description: record.get('description') description: record.get('description'),
csh_return_atm_id:csh_return_atm_id,
csh_return_bp_id:record.get('csh_return_bp_id')
}, },
success: function (res) { success: function (res) {
var return_id = res.result.return_id; var return_id = res.result.return_id;
...@@ -120,6 +123,25 @@ ...@@ -120,6 +123,25 @@
} }
} }
//附件上传
function upload_attachment_win() {
var win = new Leaf.Window({
id: 'cus_deposit1060_upload_win',
url: $('cus_deposit1060_upload_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'CSH_TRANSACTION_RETURN',
header_id: csh_return_atm_id
},
width: 900,
hight: 400
}).on('close', function () {
//record.ds.query();
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -128,6 +150,13 @@ ...@@ -128,6 +150,13 @@
<a:field name="return_date" defaultValue="${/model/sys_time_default_value_path/record/@now_time}" <a:field name="return_date" defaultValue="${/model/sys_time_default_value_path/record/@now_time}"
required="true"/> required="true"/>
<a:field name="return_amount" required="true"/> <a:field name="return_amount" required="true"/>
<a:field name="csh_return_bp_name" lovGridHeight="350" lovHeight="500" lovService="cus_deposit.CUS_DEPOSIT106.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE" required="true">
<a:mapping>
<a:map from="bp_id" to="csh_return_bp_id"/>
<a:map from="bp_name" to="csh_return_bp_name"/>
</a:mapping>
</a:field>
<a:field name="csh_return_bp_id"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
...@@ -139,7 +168,7 @@ ...@@ -139,7 +168,7 @@
<a:gridButton id="csh515_return_submit_id" click="csh515_return_submit" text="提交审批"/> <a:gridButton id="csh515_return_submit_id" click="csh515_return_submit" text="提交审批"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form title="CSH515.CSH_REFUND"> <a:form title="CSH515.CSH_REFUND">
<a:box column="3" labelWidth="115"> <a:box column="4" labelWidth="115">
<a:datePicker name="return_date" bindTarget="csh_transaction_deposit_return_maintain_ds" <a:datePicker name="return_date" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="经济业务发生日" renderer="Leaf.formatDate"/> prompt="经济业务发生日" renderer="Leaf.formatDate"/>
<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" <a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false"
...@@ -148,17 +177,22 @@ ...@@ -148,17 +177,22 @@
<a:numberField name="unwrite_off_amount" allowDecimals="true" allowFormat="true" <a:numberField name="unwrite_off_amount" allowDecimals="true" allowFormat="true"
allowNegative="false" bindTarget="csh_transaction_receipt_return_maintain_ds" allowNegative="false" bindTarget="csh_transaction_receipt_return_maintain_ds"
prompt="剩余可用金额" readOnly="true"/> prompt="剩余可用金额" readOnly="true"/>
<a:lov name="csh_return_bp_name" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="退款用户"/>
<!--<a:lov name="period_name" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.ACCOUNT_PERIOD_NAME"/>--> <!--<a:lov name="period_name" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.ACCOUNT_PERIOD_NAME"/>-->
<!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.PAYMENT_METHOD"/>--> <!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.PAYMENT_METHOD"/>-->
<!--<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_transaction_receipt_return_maintain_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE"/>--> <!--<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_transaction_receipt_return_maintain_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE"/>-->
</a:box> </a:box>
<a:box column="3" labelWidth="115"> <a:box column="4" labelWidth="115">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_deposit_return_maintain_ds" <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_deposit_return_maintain_ds"
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:textField 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:hBox>
<a>附件上传:</a><a href="javascript:upload_attachment_win()" style="color:red"> 附件上传</a>
</a:hBox>
<!-- <a href="javascript:upload_attachment_win()" style="color:red;margin-right:5px;">附件上传</a>-->
<!--<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="银行流水号"/>-->
<!--<a:comboBox name="currency_name" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.CURRENCY"/>--> <!--<a:comboBox name="currency_name" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="HLS.CURRENCY"/>-->
...@@ -178,6 +212,7 @@ ...@@ -178,6 +212,7 @@
<a:textField name="description" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="备注" <a:textField name="description" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="备注"
width="849"/> width="849"/>
</a:box> </a:box>
</a:form> </a:form>
</a:screenBody> </a:screenBody>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -214,6 +249,9 @@ ...@@ -214,6 +249,9 @@
record.set('return_date', Leaf.formatDate(new Date())); record.set('return_date', Leaf.formatDate(new Date()));
record.getField('return_date').setRequired(true); record.getField('return_date').setRequired(true);
record.getField('return_amount').setRequired(true); record.getField('return_amount').setRequired(true);
var deposit_record = $('csh_transaction_deposit_return_maintain_ds').getCurrentRecord();
deposit_record.set('csh_return_bp_name',record.get('bp_name'));
deposit_record.set('csh_return_bp_id',record.get('bp_id'));
} }
]]></script> ]]></script>
......
...@@ -10,7 +10,29 @@ ...@@ -10,7 +10,29 @@
]]></a:init-procedure> ]]></a:init-procedure>
<a:view> <a:view>
<a:link id="cus_deposit1060_download_win_link" url="${/request/@context_path}/downloadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function upload_attachment_win() {
var record = $('csh_transaction_return_wfl_ds').getCurrentRecord();
var csh_return_atm_id=record.get('csh_return_atm_id');
var win = new Leaf.Window({
id: 'cus_deposit1060_download_win',
url: $('cus_deposit1060_download_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'CSH_TRANSACTION_RETURN',
header_id: csh_return_atm_id
},
width: 900,
hight: 400
}).on('close', function () {
//record.ds.query();
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_transaction_return_wfl_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query/query?return_id=${/parameter/@return_id}" > <a:dataSet id="csh_transaction_return_wfl_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT106.csh_transaction_return_query/query?return_id=${/parameter/@return_id}" >
...@@ -27,18 +49,20 @@ ...@@ -27,18 +49,20 @@
<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" <a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false"
bindTarget="csh_transaction_return_wfl_ds" bindTarget="csh_transaction_return_wfl_ds"
prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/> prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>
<a:textField name="csh_return_bp_name" bindTarget="csh_transaction_return_wfl_ds" prompt="退款商业伙伴" readOnly="true"/>
<!--<a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_DATE" renderer="Leaf.formatDate" readOnly="true"/>--> <!--<a:datePicker name="return_date" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_DATE" renderer="Leaf.formatDate" readOnly="true"/>-->
<!--<a:lov name="period_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/>--> <!--<a:lov name="period_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/>-->
<!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.PAYMENT_METHOD" readOnly="true"/>--> <!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.PAYMENT_METHOD" readOnly="true"/>-->
<!--<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE" readOnly="true"/>--> <!--<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE" readOnly="true"/>-->
</a:box> </a:box>
<a:box column="3" labelWidth="115"> <a:box column="4" labelWidth="115">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_return_wfl_ds" <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_return_wfl_ds"
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:textField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds" <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true"/>
<a href="javascript:upload_attachment_win()" style="color:red">附件查看</a>
<!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>--> <!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>-->
<!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>--> <!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>-->
<!--<a:comboBox name="currency_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.CURRENCY" readOnly="true"/>--> <!--<a:comboBox name="currency_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.CURRENCY" readOnly="true"/>-->
......
...@@ -1382,66 +1382,6 @@ ...@@ -1382,66 +1382,6 @@
//均等计算合并计算按钮一起 //均等计算合并计算按钮一起
function hls_hls500_JD() { function hls_hls500_JD() {
var temp_head_records = $('hls_fin_calculator_ln_ds').getAll();
//一、报价器加校验:1.如果用户把所有租金都手填,则报校验“禁止手填所有期数租金!”;
// 2.如果用户手动修改租金以后,只有最后一期租金大于零,则报校验“目前不支持只有一期租金的报价!”
var count=temp_head_records.length-1;
var calc_temp=parseFloat(0);
var before_calc_count=parseFloat(0);
var last_calc_count=parseFloat(0);
var zero_calc_count=parseFloat(0);
var null_calc_count=parseFloat(0);
var last_null_calc_count=parseFloat(0);
var last_zero_calc_count=parseFloat(0);
for (var i = 0;i < temp_head_records.length;i++) {
if(temp_head_records[i].get('times')>0){
if(temp_head_records[i].get('principal_eq_pymt_adj')!==''&&temp_head_records[i].get('principal_eq_pymt_adj')>=0){
calc_temp = plus(calc_temp,parseFloat(1));
}
if(temp_head_records[i].get('principal_eq_pymt_adj')!==''&&temp_head_records[i].get('principal_eq_pymt_adj')===0){
before_calc_count = plus(before_calc_count,parseFloat(1));
}
if(temp_head_records[i].get('principal_eq_pymt_adj')!==''&&temp_head_records[i].get('principal_eq_pymt_adj')===0){
zero_calc_count = plus(zero_calc_count,parseFloat(1));
}
if(typeof(temp_head_records[i].get('principal_eq_pymt_adj')) == 'undefined'||temp_head_records[i].get('principal_eq_pymt_adj')===''){
null_calc_count = plus(null_calc_count,parseFloat(1));
}
}
if(temp_head_records[i].get('times')===count){
if(!temp_head_records[i].get('principal_eq_pymt_adj')||temp_head_records[i].get('principal_eq_pymt_adj')===''){
last_calc_count = plus(last_calc_count,parseFloat(1));
}
if(typeof(temp_head_records[i].get('principal_eq_pymt_adj')) == 'undefined'||temp_head_records[i].get('principal_eq_pymt_adj')===''){
last_null_calc_count = plus(last_null_calc_count,parseFloat(1));
}
if(temp_head_records[i].get('principal_eq_pymt_adj')!==''&&temp_head_records[i].get('principal_eq_pymt_adj')===0){
last_zero_calc_count = plus(last_zero_calc_count,parseFloat(1));
}
}
}
if(calc_temp==count){
Leaf.showMessage('${l:PROMPT}', '请保证一期以上的的调整租金为空!');
return false;
}
if(last_null_calc_count==1&&zero_calc_count==count-1){
Leaf.showMessage('${l:PROMPT}', '系统暂不支持所有租金集中在最后一期支付!');
return false;
}
// if(null_calc_count==1&&zero_calc_count==count-1){
// Leaf.showMessage('${l:PROMPT}', '目前不支持只有一期租金的报价!');
// return false;
// }
if(last_zero_calc_count==1){
Leaf.showMessage('${l:PROMPT}', '系统不支持最后一期租金为0的情况!');
return false;
}
hls_hls500_save_new(calc_execute_JD_new, 'CALC'); hls_hls500_save_new(calc_execute_JD_new, 'CALC');
......
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