Skip to content

L
leaf-hlcm
Commit 62cf254f authored by lizhe's avatar lizhe
Browse files
Options

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

parents 987a92d4 43bd122b
Hide whitespace changes
Inline Side-by-side
Showing with 1189 additions and 200 deletions
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_invoice_inf_import_total.lwm 0 → 100644
View file @ 62cf254f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhuxianfei
$Date: 2018/7/26 14:11
$Revision: 1.0
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
acp_invoice_import_pkg.ACP_INVOICE_IMPORT_TOTAL(
p_invoice_type => ${@invoice_type},
p_invoice_code => ${@invoice_code},
p_invoice_number => ${@invoice_number},
p_total_amount => ${@total_amount},
p_invoice_date => ${@invoice_date},
p_user_id => ${/session/@user_id},
p_contract_id => ${@contract_id});
end;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
acp_invoice_import_pkg.submit_wfl( p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id},
p_company_id => ${/session/@company_id});
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm
View file @ 62cf254f
......@@ -62,6 +62,7 @@
<bm:field name="first_contract_flag"/>
<bm:field name="finance_type"/>
<bm:field name="secondary_lease"/>
<bm:field name="secondary_lease_new"/>
<bm:field name="marital_status_flag"/>
<bm:field name="sp_sign_flag"/>
<bm:field name="vender_id"/>
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly.lwm
View file @ 62cf254f
......@@ -123,8 +123,7 @@
from con_cashflow_monthly_temp t, hls_bp_master m, gld_accounts g
where m.bp_id = t.agent_bp_id
and g.account_id(+) = t.account_id
and t.session_id = ${/session/@session_id}
union
union
select tt.unreceived_sum_amount,
tt.overdue_sum_amount,
not_due_sum_amount,
......@@ -325,7 +324,6 @@
t.vender_id,
t.division
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.contract_id, t.bp_id, t.agent_bp_id,t.vender_id,t.division) tt,
hls_bp_master m
where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_agent.lwm
View file @ 62cf254f
......@@ -162,8 +162,7 @@
t.account_id,
t.account_code
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.agent_bp_id,
group by t.agent_bp_id,
t.division,
t.account_id,
t.account_code) tt,
......@@ -319,8 +318,7 @@
t.agent_bp_id,
t.division
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.agent_bp_id, t.division) tt,
group by t.agent_bp_id, t.division) tt,
hls_bp_master m
where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
order by ttt.agent_bp_id,ttt.division, ttt.account_id_n
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_lease_item.lwm
View file @ 62cf254f
......@@ -161,7 +161,7 @@
t.account_code,
t.agent_bp_id
from con_cashflow_monthly_temp t,hls_bp_master hm
where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
where hm.bp_id=t.agent_bp_id
group by t.division, t.account_id, t.account_code,t.agent_bp_id) tt,
gld_accounts g
where g.account_id(+) = tt.account_id
......@@ -312,7 +312,7 @@
t.division,
t.agent_bp_id
from con_cashflow_monthly_temp t,hls_bp_master hm
where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
where hm.bp_id=t.agent_bp_id
group by t.division,t.agent_bp_id) tt) ttt #WHERE_CLAUSE#
order by ttt.division, ttt.account_id_n
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_n.lwm 0 → 100644
View file @ 62cf254f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: WangYu
$Date: 2014-4-25 上午09:30:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from (select t.unreceived_sum_amount,
t.overdue_sum_amount,
not_due_sum_amount,
t.overdue_amount_1,
t.overdue_amount_2,
t.overdue_amount_3,
t.overdue_amount_left,
t.not_due_amount_1,
t.not_due_amount_2,
t.not_due_amount_3,
t.not_due_amount_4,
t.not_due_amount_5,
t.not_due_amount_6,
t.not_due_amount_left,
t.not_due_amount_7,
t.not_due_amount_8,
t.not_due_amount_9,
t.not_due_amount_10,
t.not_due_amount_11,
t.not_due_amount_12,
t.not_due_amount_13,
t.not_due_amount_14,
t.not_due_amount_15,
t.not_due_amount_16,
t.not_due_amount_17,
t.not_due_amount_18,
t.not_due_amount_19,
t.not_due_amount_20,
t.not_due_amount_21,
t.not_due_amount_22,
t.not_due_amount_23,
t.not_due_amount_24,
t.not_due_amount_25,
t.not_due_amount_26,
t.not_due_amount_27,
t.not_due_amount_28,
t.not_due_amount_29,
t.not_due_amount_30,
t.not_due_amount_31,
t.not_due_amount_32,
t.not_due_amount_33,
t.not_due_amount_34,
t.not_due_amount_35,
t.not_due_amount_36,
t.not_due_amount_37,
t.not_due_amount_38,
t.not_due_amount_39,
t.not_due_amount_40,
t.not_due_amount_41,
t.not_due_amount_42,
t.not_due_amount_43,
t.not_due_amount_44,
t.not_due_amount_45,
t.not_due_amount_46,
t.not_due_amount_47,
t.not_due_amount_48,
t.not_due_amount_49,
t.not_due_amount_50,
t.not_due_amount_51,
t.not_due_amount_52,
t.not_due_amount_53,
t.not_due_amount_54,
t.not_due_amount_55,
t.not_due_amount_56,
t.not_due_amount_57,
t.not_due_amount_58,
t.not_due_amount_59,
t.not_due_amount_60,
t.not_due_amount_61,
t.not_due_amount_62,
t.not_due_amount_63,
t.not_due_amount_64,
t.not_due_amount_65,
t.not_due_amount_66,
t.not_due_amount_67,
t.not_due_amount_68,
t.not_due_amount_69,
t.not_due_amount_70,
t.not_due_amount_48_left,
t.not_due_amount_year_1,
t.not_due_amount_year_2,
t.not_due_amount_year_3,
t.not_due_amount_year_4,
t.not_due_amount_year_5,
t.not_due_amount_year_5_left,
m.bp_name bp_id_agent_level1_n,
(select m.bp_code from hls_bp_master m where m.bp_id = t.bp_id) bp_code,
(select contract_number
from con_contract
where contract_id = t.contract_id) contract_number,
(Select bt.description
From hls_business_type bt,con_contract ct
Where bt.business_type = ct.business_type
and ct.contract_id = t.contract_id) As business_type_n,
t.account_code account_id_n,
(select description_text
from fnd_descriptions
where description_id = g.description_id
and language = 'ZHS') account_name,
t.contract_id,
(SELECT bpv.bp_name
FROM hls_bp_master_lv bpv,con_contract cc
WHERE bpv.bp_id = cc.bp_id_tenant
and cc.contract_id = t.contract_id
and rownum = 1) bp_id_telnet_n,
t.bp_id,
t.agent_bp_id,
((select v.bp_name from hls_bp_master v where v.bp_id = t.vender_id)||'/'||(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'DIVISION' AND v.code_value = t.division))division_n,t.division
from con_cashflow_monthly_temp t, hls_bp_master m, gld_accounts g
where m.bp_id = t.agent_bp_id
and g.account_id(+) = t.account_id
and t.session_id = ${/session/@session_id}
union
select tt.unreceived_sum_amount,
tt.overdue_sum_amount,
not_due_sum_amount,
tt.overdue_amount_1,
tt.overdue_amount_2,
tt.overdue_amount_3,
tt.overdue_amount_left,
tt.not_due_amount_1,
tt.not_due_amount_2,
tt.not_due_amount_3,
tt.not_due_amount_4,
tt.not_due_amount_5,
tt.not_due_amount_6,
tt.not_due_amount_left,
tt.not_due_amount_7,
tt.not_due_amount_8,
tt.not_due_amount_9,
tt.not_due_amount_10,
tt.not_due_amount_11,
tt.not_due_amount_12,
tt.not_due_amount_13,
tt.not_due_amount_14,
tt.not_due_amount_15,
tt.not_due_amount_16,
tt.not_due_amount_17,
tt.not_due_amount_18,
tt.not_due_amount_19,
tt.not_due_amount_20,
tt.not_due_amount_21,
tt.not_due_amount_22,
tt.not_due_amount_23,
tt.not_due_amount_24,
tt.not_due_amount_25,
tt.not_due_amount_26,
tt.not_due_amount_27,
tt.not_due_amount_28,
tt.not_due_amount_29,
tt.not_due_amount_30,
tt.not_due_amount_31,
tt.not_due_amount_32,
tt.not_due_amount_33,
tt.not_due_amount_34,
tt.not_due_amount_35,
tt.not_due_amount_36,
tt.not_due_amount_37,
tt.not_due_amount_38,
tt.not_due_amount_39,
tt.not_due_amount_40,
tt.not_due_amount_41,
tt.not_due_amount_42,
tt.not_due_amount_43,
tt.not_due_amount_44,
tt.not_due_amount_45,
tt.not_due_amount_46,
tt.not_due_amount_47,
tt.not_due_amount_48,
tt.not_due_amount_49,
tt.not_due_amount_50,
tt.not_due_amount_51,
tt.not_due_amount_52,
tt.not_due_amount_53,
tt.not_due_amount_54,
tt.not_due_amount_55,
tt.not_due_amount_56,
tt.not_due_amount_57,
tt.not_due_amount_58,
tt.not_due_amount_59,
tt.not_due_amount_60,
tt.not_due_amount_61,
tt.not_due_amount_62,
tt.not_due_amount_63,
tt.not_due_amount_64,
tt.not_due_amount_65,
tt.not_due_amount_66,
tt.not_due_amount_67,
tt.not_due_amount_68,
tt.not_due_amount_69,
tt.not_due_amount_70,
tt.not_due_amount_48_left,
tt.not_due_amount_year_1,
tt.not_due_amount_year_2,
tt.not_due_amount_year_3,
tt.not_due_amount_year_4,
tt.not_due_amount_year_5,
tt.not_due_amount_year_5_left,
m.bp_name bp_id_agent_level1_n,
(select m.bp_code
from hls_bp_master m
where m.bp_id = tt.bp_id) bp_code,
(select contract_number
from con_contract
where contract_id = tt.contract_id) contract_number,
(Select bt.description
From hls_business_type bt,con_contract ct
Where bt.business_type = ct.business_type
and ct.contract_id = tt.contract_id) As business_type_n,
'小计:' account_id_n,
null account_name,
tt.contract_id,
(SELECT bpv.bp_name
FROM hls_bp_master_lv bpv,con_contract cc
WHERE bpv.bp_id = cc.bp_id_tenant
and cc.contract_id = tt.contract_id
and rownum = 1) bp_id_telnet_n,
tt.bp_id,
tt.agent_bp_id,
((select v.bp_name from hls_bp_master v where v.bp_id = tt.vender_id)||'/'||(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'DIVISION' AND v.code_value = tt.division))division_n,tt.division
from (select sum(nvl(t.unreceived_sum_amount, 0)) unreceived_sum_amount,
sum(nvl(t.overdue_sum_amount, 0)) overdue_sum_amount,
sum(nvl(t.not_due_sum_amount, 0)) not_due_sum_amount,
sum(nvl(t.overdue_amount_1, 0)) overdue_amount_1,
sum(nvl(t.overdue_amount_2, 0)) overdue_amount_2,
sum(nvl(t.overdue_amount_3, 0)) overdue_amount_3,
sum(nvl(t.overdue_amount_left, 0)) overdue_amount_left,
sum(nvl(t.not_due_amount_1, 0)) not_due_amount_1,
sum(nvl(t.not_due_amount_2, 0)) not_due_amount_2,
sum(nvl(t.not_due_amount_3, 0)) not_due_amount_3,
sum(nvl(t.not_due_amount_4, 0)) not_due_amount_4,
sum(nvl(t.not_due_amount_5, 0)) not_due_amount_5,
sum(nvl(t.not_due_amount_6, 0)) not_due_amount_6,
sum(nvl(t.not_due_amount_left, 0)) not_due_amount_left,
sum(nvl(t.not_due_amount_7, 0)) not_due_amount_7,
sum(nvl(t.not_due_amount_8, 0)) not_due_amount_8,
sum(nvl(t.not_due_amount_9, 0)) not_due_amount_9,
sum(nvl(t.not_due_amount_10, 0)) not_due_amount_10,
sum(nvl(t.not_due_amount_11, 0)) not_due_amount_11,
sum(nvl(t.not_due_amount_12, 0)) not_due_amount_12,
sum(nvl(t.not_due_amount_13, 0)) not_due_amount_13,
sum(nvl(t.not_due_amount_14, 0)) not_due_amount_14,
sum(nvl(t.not_due_amount_15, 0)) not_due_amount_15,
sum(nvl(t.not_due_amount_16, 0)) not_due_amount_16,
sum(nvl(t.not_due_amount_17, 0)) not_due_amount_17,
sum(nvl(t.not_due_amount_18, 0)) not_due_amount_18,
sum(nvl(t.not_due_amount_19, 0)) not_due_amount_19,
sum(nvl(t.not_due_amount_20, 0)) not_due_amount_20,
sum(nvl(t.not_due_amount_21, 0)) not_due_amount_21,
sum(nvl(t.not_due_amount_22, 0)) not_due_amount_22,
sum(nvl(t.not_due_amount_23, 0)) not_due_amount_23,
sum(nvl(t.not_due_amount_24, 0)) not_due_amount_24,
sum(nvl(t.not_due_amount_25, 0)) not_due_amount_25,
sum(nvl(t.not_due_amount_26, 0)) not_due_amount_26,
sum(nvl(t.not_due_amount_27, 0)) not_due_amount_27,
sum(nvl(t.not_due_amount_28, 0)) not_due_amount_28,
sum(nvl(t.not_due_amount_29, 0)) not_due_amount_29,
sum(nvl(t.not_due_amount_30, 0)) not_due_amount_30,
sum(nvl(t.not_due_amount_31, 0)) not_due_amount_31,
sum(nvl(t.not_due_amount_32, 0)) not_due_amount_32,
sum(nvl(t.not_due_amount_33, 0)) not_due_amount_33,
sum(nvl(t.not_due_amount_34, 0)) not_due_amount_34,
sum(nvl(t.not_due_amount_35, 0)) not_due_amount_35,
sum(nvl(t.not_due_amount_36, 0)) not_due_amount_36,
sum(nvl(t.not_due_amount_37, 0)) not_due_amount_37,
sum(nvl(t.not_due_amount_38, 0)) not_due_amount_38,
sum(nvl(t.not_due_amount_39, 0)) not_due_amount_39,
sum(nvl(t.not_due_amount_40, 0)) not_due_amount_40,
sum(nvl(t.not_due_amount_41, 0)) not_due_amount_41,
sum(nvl(t.not_due_amount_42, 0)) not_due_amount_42,
sum(nvl(t.not_due_amount_43, 0)) not_due_amount_43,
sum(nvl(t.not_due_amount_44, 0)) not_due_amount_44,
sum(nvl(t.not_due_amount_45, 0)) not_due_amount_45,
sum(nvl(t.not_due_amount_46, 0)) not_due_amount_46,
sum(nvl(t.not_due_amount_47, 0)) not_due_amount_47,
sum(nvl(t.not_due_amount_48, 0)) not_due_amount_48,
sum(nvl(t.not_due_amount_49, 0)) not_due_amount_49,
sum(nvl(t.not_due_amount_50, 0)) not_due_amount_50,
sum(nvl(t.not_due_amount_51, 0)) not_due_amount_51,
sum(nvl(t.not_due_amount_52, 0)) not_due_amount_52,
sum(nvl(t.not_due_amount_53, 0)) not_due_amount_53,
sum(nvl(t.not_due_amount_54, 0)) not_due_amount_54,
sum(nvl(t.not_due_amount_55, 0)) not_due_amount_55,
sum(nvl(t.not_due_amount_56, 0)) not_due_amount_56,
sum(nvl(t.not_due_amount_57, 0)) not_due_amount_57,
sum(nvl(t.not_due_amount_58, 0)) not_due_amount_58,
sum(nvl(t.not_due_amount_59, 0)) not_due_amount_59,
sum(nvl(t.not_due_amount_60, 0)) not_due_amount_60,
sum(nvl(t.not_due_amount_61, 0)) not_due_amount_61,
sum(nvl(t.not_due_amount_62, 0)) not_due_amount_62,
sum(nvl(t.not_due_amount_63, 0)) not_due_amount_63,
sum(nvl(t.not_due_amount_64, 0)) not_due_amount_64,
sum(nvl(t.not_due_amount_65, 0)) not_due_amount_65,
sum(nvl(t.not_due_amount_66, 0)) not_due_amount_66,
sum(nvl(t.not_due_amount_67, 0)) not_due_amount_67,
sum(nvl(t.not_due_amount_68, 0)) not_due_amount_68,
sum(nvl(t.not_due_amount_69, 0)) not_due_amount_69,
sum(nvl(t.not_due_amount_70, 0)) not_due_amount_70,
sum(nvl(t.not_due_amount_48_left, 0)) not_due_amount_48_left,
sum(nvl(t.not_due_amount_year_1, 0)) not_due_amount_year_1,
sum(nvl(t.not_due_amount_year_2, 0)) not_due_amount_year_2,
sum(nvl(t.not_due_amount_year_3, 0)) not_due_amount_year_3,
sum(nvl(t.not_due_amount_year_4, 0)) not_due_amount_year_4,
sum(nvl(t.not_due_amount_year_5, 0)) not_due_amount_year_5,
sum(nvl(t.not_due_amount_year_5_left, 0)) not_due_amount_year_5_left,
t.contract_id,
t.bp_id,
t.agent_bp_id,
t.vender_id,
t.division
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.contract_id, t.bp_id, t.agent_bp_id,t.vender_id,t.division) tt,
hls_bp_master m
where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
order by ttt.contract_id, ttt.account_id_n
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_cashflow_monthly_pkg.query_con_cash_temp_data_job(p_user_id =>${/session/@user_id} );
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="division_n"/>
<bm:field name="division"/>
<bm:field name="business_type_n"/>
<bm:field name="contract_id"/>
<bm:field name="bp_code"/>
<bm:field name="contract_number"/>
<bm:field name="bp_id_telnet_n"/>
<bm:field name="bp_id_agent_level1_n"/>
<bm:field name="account_id_n"/>
<bm:field name="account_name"/>
<bm:field name="unreceived_sum_amount"/>
<bm:field name="overdue_amount_1"/>
<bm:field name="overdue_amount_2"/>
<bm:field name="overdue_amount_3"/>
<bm:field name="overdue_amount_left"/>
<bm:field name="overdue_sum_amount"/>
<bm:field name="not_due_sum_amount"/>
<bm:field name="not_due_amount_1"/>
<bm:field name="not_due_amount_2"/>
<bm:field name="not_due_amount_3"/>
<bm:field name="not_due_amount_4"/>
<bm:field name="not_due_amount_5"/>
<bm:field name="not_due_amount_6"/>
<bm:field name="not_due_amount_left"/>
<bm:field name="not_due_amount_7"/>
<bm:field name="not_due_amount_8"/>
<bm:field name="not_due_amount_9"/>
<bm:field name="not_due_amount_10"/>
<bm:field name="not_due_amount_11"/>
<bm:field name="not_due_amount_12"/>
<bm:field name="not_due_amount_13"/>
<bm:field name="not_due_amount_14"/>
<bm:field name="not_due_amount_15"/>
<bm:field name="not_due_amount_16"/>
<bm:field name="not_due_amount_17"/>
<bm:field name="not_due_amount_18"/>
<bm:field name="not_due_amount_19"/>
<bm:field name="not_due_amount_20"/>
<bm:field name="not_due_amount_21"/>
<bm:field name="not_due_amount_22"/>
<bm:field name="not_due_amount_23"/>
<bm:field name="not_due_amount_24"/>
<bm:field name="not_due_amount_25"/>
<bm:field name="not_due_amount_26"/>
<bm:field name="not_due_amount_27"/>
<bm:field name="not_due_amount_28"/>
<bm:field name="not_due_amount_29"/>
<bm:field name="not_due_amount_30"/>
<bm:field name="not_due_amount_31"/>
<bm:field name="not_due_amount_32"/>
<bm:field name="not_due_amount_33"/>
<bm:field name="not_due_amount_34"/>
<bm:field name="not_due_amount_35"/>
<bm:field name="not_due_amount_36"/>
<bm:field name="not_due_amount_37"/>
<bm:field name="not_due_amount_38"/>
<bm:field name="not_due_amount_39"/>
<bm:field name="not_due_amount_40"/>
<bm:field name="not_due_amount_41"/>
<bm:field name="not_due_amount_42"/>
<bm:field name="not_due_amount_43"/>
<bm:field name="not_due_amount_44"/>
<bm:field name="not_due_amount_45"/>
<bm:field name="not_due_amount_46"/>
<bm:field name="not_due_amount_47"/>
<bm:field name="not_due_amount_48"/>
<bm:field name="not_due_amount_49"/>
<bm:field name="not_due_amount_50"/>
<bm:field name="not_due_amount_51"/>
<bm:field name="not_due_amount_52"/>
<bm:field name="not_due_amount_53"/>
<bm:field name="not_due_amount_54"/>
<bm:field name="not_due_amount_55"/>
<bm:field name="not_due_amount_56"/>
<bm:field name="not_due_amount_57"/>
<bm:field name="not_due_amount_58"/>
<bm:field name="not_due_amount_59"/>
<bm:field name="not_due_amount_60"/>
<bm:field name="not_due_amount_61"/>
<bm:field name="not_due_amount_62"/>
<bm:field name="not_due_amount_63"/>
<bm:field name="not_due_amount_64"/>
<bm:field name="not_due_amount_65"/>
<bm:field name="not_due_amount_66"/>
<bm:field name="not_due_amount_67"/>
<bm:field name="not_due_amount_68"/>
<bm:field name="not_due_amount_69"/>
<bm:field name="not_due_amount_70"/>
<bm:field name="not_due_amount_48_left"/>
<bm:field name="not_due_amount_year_1"/>
<bm:field name="not_due_amount_year_2"/>
<bm:field name="not_due_amount_year_3"/>
<bm:field name="not_due_amount_year_4"/>
<bm:field name="not_due_amount_year_5"/>
<bm:field name="not_due_amount_year_5_left"/>
</bm:fields>
<!-- <bm:query-fields>-->
<!-- <bm:query-field field="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>-->
<!-- <bm:query-field field="account_name" queryExpression="t1.account_name = ${@account_name}"/>-->
<!-- <bm:query-field field="account_id_n" queryExpression="t1.account_id_n = ${@account_id_n}"/>-->
<!-- </bm:query-fields>-->
<bm:query-fields>
<bm:query-field field="division" queryExpression="ttt.division in (${:@division})"/>
<bm:query-field name="bp_id" queryExpression="ttt.agent_bp_id in (${:@bp_id})"/>
<bm:query-field name="bp_id_agent_level1_id" queryExpression="to_char(ttt.agent_bp_id) in (select regexp_substr(${@bp_id},
'[^;]+',
1,
level)
from dual
connect by regexp_substr(${@bp_id},
'[^;]+',
1,
level) is not null)"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON930/insert_con_cash_temp_data_job.lwm 0 → 100644
View file @ 62cf254f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: WangYu
$Date: 2014-4-25 上午09:30:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_cashflow_monthly_pkg.insert_con_cash_temp_data_job(
p_session_id =>${/session/@session_id},
p_due_date =>to_date(${@due_date},'yyyy-mm-dd'),
p_user_id =>${/session/@user_id},
p_business_type =>${@business_type});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 62cf254f
......@@ -207,8 +207,8 @@
and pq.document_category = 'PROJECT')) other_payment2,
i.pattern,
i.machine_number,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250 and CF_STATUS != 'BLOCK'),0)repur_con_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250 and CF_STATUS != 'BLOCK'),0)repur_con_ddct_amt,
nvl(t.entrusted_amount,0) entrusted_amount,
decode(t.business_type,'LEASEBACK',(f.due_amount-nvl((select to_number(hd.other_payment2)
from hls_fin_calculator_hd hd
......
src/main/webapp/modules/acp/ACP522/ap_invoice_import_detail.lview
View file @ 62cf254f
......@@ -2,74 +2,76 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
trace="true">
<a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="basic.sys_session_info" rootPath="user_name_path"/>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="basic.sys_session_info"
rootPath="user_name_path"/>
</a:init-procedure>
<a:view>
<a:link id="acp_invoice_inf_import_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="update"/>
<a:link id="acp_invoice_inf_import_total_link" model="acp.ACP522.acp_invoice_inf_import_total" modelaction="update"/>
<a:link id="acp_invoice_inf_import_submit_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="execute"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script><![CDATA[
//移除前事件(grid,attach,gridbox,table)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_brfore_remove'] = function(ds, record, bp_seq) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_brfore_remove'] = function (ds, record, bp_seq) {
return true;
};
Leaf.onReady(function () {
//document.getElementById("ext-gen935").placeholder = "在这输入姓名..";
// document.getElementById("ext-gen124").style.backgroundColor = 'red';
// document.getElementById("ext-gen124").setAttribute('placeholder','注：扫描时请将鼠标光标放在此处。。。');
// document.getElementById("ext-gen124").style.backgroundColor = 'red';
// document.getElementById("ext-gen124").setAttribute('placeholder','注：扫描时请将鼠标光标放在此处。。。');
//document.getElementById("ext-gen124").style.color = 'red';
//document.getElementById("ext-gen124").style.backgroundColor = '#FF7744';
var first=document.getElementsByClassName("item-input-wrap");
var second=first[2].getElementsByClassName('item-textField');
var third=second[0];
third.setAttribute('placeholder','注：扫描时请将鼠标光标放在此处。。。');
var first = document.getElementsByClassName("item-input-wrap");
var second = first[2].getElementsByClassName('item-textField');
var third = second[0];
third.setAttribute('placeholder', '注：扫描时请将鼠标光标放在此处。。。');
third.style.backgroundColor = '#FF7744';
});
//新增时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
record.set("created_by_n",'${/model/user_name_path/record/@user_desc}');
record.set("created_by",'${/session/@user_id}');
record.set("update_date",new Date());
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function (ds, record, config_records, bp_seq) {
record.set("created_by_n", '${/model/user_name_path/record/@user_desc}');
record.set("created_by", '${/session/@user_id}');
record.set("update_date", new Date());
};
//提交审批
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
debugger;
var hd_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
var hd_record = $(hd_id).getAt(0);
var lease_item_amount=hd_record.get('lease_item_amount');
if($(ds_id).getAll().dirty){
var lease_item_amount = hd_record.get('lease_item_amount');
if ($(ds_id).getAll().dirty) {
return;
}
if ($(ds_id).validate()) {
debugger;
var records = $(ds_id).getAll();
if(records.length<1){
if (records.length < 1) {
Leaf.showMessage('提示', '未查询到发票信息，请添加发票信息!');
return;
}
var sum=0;
var sum = 0;
var sum_tax = 0;
var net_lease_item_amount = hd_record.get('net_lease_item_amount')||0;
for (var i = 0;i < records.length;i++) {
if(records[i].dirty){
var net_lease_item_amount = hd_record.get('net_lease_item_amount') || 0;
for (var i = 0; i < records.length; i++) {
if (records[i].dirty) {
Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
var tempa=records[i].get('total_amount')||0;
var tempa = records[i].get('total_amount') || 0;
//var tempb=((records[i].get('net_amount')||0)+(records[i].get('tax_amount')||0));
var tempb=plus((records[i].get('net_amount')||0),(records[i].get('tax_amount')||0));
if(tempa!=tempb){
var tempb = plus((records[i].get('net_amount') || 0), (records[i].get('tax_amount') || 0));
if (tempa != tempb) {
Leaf.showMessage('提示', '发票明细行存在价税合计不等于不含税金额和税额之和！');
return;
}
var r = records[i];
var d = r.get(name);
var n = records[i].get('total_amount')||0;
var n = records[i].get('total_amount') || 0;
if (!isNaN(n)) {
sum = plus(sum, n);
}
......@@ -81,42 +83,42 @@
// }
// 营业外收入或营业外支出科目金额超过1，请联系系统管理员！
if (!isNaN(records[i].get('tax_amount')||0)) {
sum_tax=plus((records[i].get('tax_amount')||0),(sum_tax||0));
if (!isNaN(records[i].get('tax_amount') || 0)) {
sum_tax = plus((records[i].get('tax_amount') || 0), (sum_tax || 0));
}
//校验重复发票号码 add by 26887cz 2021-09-07
for(var j =i+1;j < records.length;j++){
if(records[i].get('invoice_number')==records[j].get('invoice_number')){
//校验重复发票号码 add by 26887cz 2021-09-07
for (var j = i + 1; j < records.length; j++) {
if (records[i].get('invoice_number') == records[j].get('invoice_number')) {
Leaf.showMessage('提示', '发票号码重复,请重新扫描输入！');
return;
}
}
}
if(sum!=lease_item_amount){
if (sum != lease_item_amount) {
Leaf.showMessage('提示', '本次发票明细含税总计不等于该合同设备价！');
return;
}
var diff = ((net_lease_item_amount + sum_tax - lease_item_amount) > 0 ? (net_lease_item_amount + sum_tax - lease_item_amount) : (lease_item_amount - sum_tax - net_lease_item_amount));
if(diff >1){
if (diff > 1) {
Leaf.showMessage('提示', '营业外收入或营业外支出科目金额超过1，请联系系统管理员！');
return;
}
Leaf.showConfirm('${l:HLS.PROMPT}', '确定提交审批吗？', function() {
Leaf.showConfirm('${l:HLS.PROMPT}', '确定提交审批吗？', function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('acp_invoice_inf_import_submit_link').getUrl(),
para: {
contract_id: hd_record.get('contract_id')
},
success: function(res) {
success: function (res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
failure: function() {
failure: function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
error: function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
......@@ -126,11 +128,11 @@
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var acp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
var record = $(ds_id).getAt(0);
if(name == 'invoice'&&value&&record.get('contract_id')) {
if (name == 'invoice' && value && record.get('contract_id')) {
var contract_id = record.get('contract_id');
var strs = value.split(',');
var invoice_type = strs[1];
......@@ -138,14 +140,106 @@
var invoice_number = strs[3];
var net_amount = strs[4];
var invoice_date = strs[5];
var total_amount =strs[4];
//检验设备价格需要大于不含税金额
if (strs.length ==9) {
//校验重复发票号码 add by 26887cz 2021-09-07
if (strs.length == 9) {
//校验重复发票号码 add by 26887cz 2021-09-07
var acr_records = $(acp_ds_id).getAll();
for(var i= 0 ; i<acr_records.length ;i++){
if(acr_records[i].get("invoice_number") == invoice_number){
for (var i = 0; i < acr_records.length; i++) {
if (acr_records[i].get("invoice_number") == invoice_number) {
Leaf.showMessage('提示', '发票号码重复,请重新扫描！');
setTimeout(function() {
setTimeout(function () {
record.set('invoice', '');
}, 50);
return;
}
}
Leaf.request({
url: $('acp_invoice_inf_import_link').getUrl(),
para: {
invoice_type: invoice_type,
invoice_code: invoice_code,
invoice_number: invoice_number,
net_amount: net_amount,
invoice_date: invoice_date,
contract_id: contract_id
},
success: function () {
Leaf.SideBar.show({
msg: '导入成功',
duration: 2000
}
);
setTimeout(function () {
record.set('invoice', '');
}, 50);
$(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(acp_ds_id).query();
}, failure: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
error: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
scope: this
});
} else if (strs.length == 8) {
//校验重复发票号码 add by 26887cz 2021-09-07
var acr_records = $(acp_ds_id).getAll();
for (var i = 0; i < acr_records.length; i++) {
if (acr_records[i].get("invoice_number") == invoice_number) {
Leaf.showMessage('提示', '发票号码重复,请重新扫描！');
setTimeout(function () {
record.set('invoice', '');
}, 50);
return;
}
}
Leaf.request({
url: $('acp_invoice_inf_import_total_link').getUrl(),
para: {
invoice_type: invoice_type,
invoice_code: invoice_code,
invoice_number: invoice_number,
total_amount: total_amount,
invoice_date: invoice_date,
contract_id: contract_id
},
success: function () {
Leaf.SideBar.show({
msg: '导入成功',
duration: 2000
}
);
setTimeout(function () {
record.set('invoice', '');
}, 50);
$(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(acp_ds_id).query();
}, failure: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
error: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
scope: this
});
} else if (strs.length == 7) {
//校验重复发票号码 add by 26887cz 2021-09-07
var acr_records = $(acp_ds_id).getAll();
for (var i = 0; i < acr_records.length; i++) {
if (acr_records[i].get("invoice_number") == invoice_number) {
Leaf.showMessage('提示', '发票号码重复,请重新扫描！');
setTimeout(function () {
record.set('invoice', '');
}, 50);
return;
......@@ -167,32 +261,31 @@
duration: 2000
}
);
setTimeout(function() {
setTimeout(function () {
record.set('invoice', '');
}, 50);
$(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(acp_ds_id).query();
},failure: function() {
setTimeout(function() {
$(acp_ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(acp_ds_id).query();
}, failure: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
error: function() {
setTimeout(function() {
error: function () {
setTimeout(function () {
record.set('invoice', '');
}, 50);
},
scope: this
});
} else {
}else {
Leaf.showMessage('提示', '发票信息有错误,请重新扫描！');
setTimeout(function() {
setTimeout(function () {
record.set('invoice', '');
}, 50);
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @ 62cf254f
......@@ -36,6 +36,7 @@
<a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/>
<a:field name="pay_method_n" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/>
<a:field name="secondary_lease_new_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease_new" valueField="code_value"/>
<a:field name="marital_status_flag_n" displayField="code_value_name" options="marital_status_flag_ds" returnField="marital_status_flag" valueField="code_value"/>
<a:field name="sp_sign_flag_n" displayField="code_value_name" options="sp_sign_flag_ds" returnField="sp_sign_flag" valueField="code_value"/>
<a:field name="finance_type"/>
......@@ -126,7 +127,8 @@
<a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/>
<a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="旧机二次租赁" width="100"/>
<a:column name="secondary_lease_new_n" editor="cb" prompt="新机二次租赁" width="100"/>
<a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/>
<a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/>
<a:column name="business_type" editor="lov" prompt="业务类型" width="80"/>
......
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ 62cf254f
......@@ -7,7 +7,10 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:view>
<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>
<!--<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>-->
<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/>
<a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/>
<script><![CDATA[
function CON321_con_contract_query() {
if ($('con_contract_cashflow_monthly_query_ds').validate()){
......@@ -53,7 +56,7 @@
Leaf.request({
url: $('con_cashflow_pre_query_id').getUrl(),
para: {
due_date : record.get('due_date'),
/*due_date : record.get('due_date'),
division:record.data.division,
bp_id : record.get('bp_id'),
business_type : record.get('business_type'),
......@@ -65,7 +68,7 @@
not_overday3:record.get('not_overday3'),
not_overday4:record.get('not_overday4'),
not_overday5:record.get('not_overday5'),
not_overday6:record.get('not_overday6')
not_overday6:record.get('not_overday6')*/
},
success: function(res) {
Leaf.Masker.unmask (Ext.getBody());
......@@ -85,6 +88,30 @@
}
}
function CON321_con_contract_update() {
var headers_ds = $('con_contract_cashflow_monthly_query_ds');
var record = headers_ds.getAt(0);
Leaf.Masker.mask(Ext.getBody(), '正在更新数据，请稍等...');
Leaf.request({
url: $('con_cashflow_pre_update_id').getUrl(),
para: {
due_date : record.get('due_date'),
business_type : record.get('business_type')
},
success: function(res) {
Leaf.Masker.unmask (Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask (Ext.getBody());
},
error: function() {
Leaf.Masker.unmask (Ext.getBody());
},
scope: this
});
}
function CON321_con_contract_reset() {
$('con_contract_cashflow_monthly_query_ds').reset();
}
......@@ -149,6 +176,7 @@
<a:screenBody>
<a:screenTopToolbar>
<a:gridButton click="CON321_con_contract_query" text="HLS.QUERY"/>
<a:gridButton click="CON321_con_contract_update" text="更新全量数据"/>
<a:gridButton click="CON321_con_contract_reset" text="HLS.RESET"/>
</a:screenTopToolbar>
<a:form bindTarget="con_contract_cashflow_balance_query_ds" column="3" title="收付款预定查询" marginWidth="40">
......@@ -224,8 +252,7 @@
<a:column name="not_due_amount_4" align="center" prompt="未到期4个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_5" align="center" prompt="未到期5个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_6" align="center" prompt="未到期6个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_8" align="center" prompt="未到期8个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_9" align="center" prompt="未到期9个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_10" align="center" prompt="未到期10个月" renderer="Leaf.formatMoney" width="80"/>
......@@ -289,6 +316,7 @@
<a:column name="not_due_amount_68" align="center" prompt="未到期68个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_69" align="center" prompt="未到期69个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_70" align="center" prompt="未到期70个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
<!--<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/>-->
<a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/>
......
src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview
View file @ 62cf254f
......@@ -18,6 +18,7 @@
<a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id"
url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
......@@ -172,7 +173,14 @@
}
var header_id = return_id;
var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
var url;
if ('${/parameter/@upload_flag}' == 'Y') {
url = $('transaction_return_uploadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
} else {
url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
......
src/main/webapp/modules/hls/HLS536/hls_journal_attach_trans_upload.lview
View file @ 62cf254f
......@@ -13,6 +13,7 @@
var year=data[0].year;
var month=data[0].month;
var factory = new Packages.org.apache.commons.fileupload.disk.DiskFileItemFactory();
factory.setSizeThreshold(10);
var up = new Packages.org.apache.commons.fileupload.servlet.ServletFileUpload(factory);
var items = up.parseRequest(request);
var i = items.iterator();
......@@ -57,7 +58,7 @@
if(output!=null){
output.close();
}
raise_app_error('上传文件出错,请联系管理员！');
raise_app_error('上传文件出错,请联系管理员！'+String(e.javaException.getMessage()));
println('上传文件出错,请联系管理员！e');
}
var file_length=get_file_length(file_path+file_name);
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 62cf254f
......@@ -455,6 +455,18 @@
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
debugger;
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同！');
return false;
}
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
......@@ -464,10 +476,13 @@
return false;
}
if (record.get('signing_city')){
var reg = /^([\u2E80-\u9FFF]){4,}$/;
if (!reg.test(record.get('signing_city'))) {
$L.showErrorMessage('提示', '合同签订地建议格式：“xx市xx区”（也可填写详细地址）!');
return false;
// var reg = /^([\u2E80-\u9FFF]){4,}$/;
// if (!reg.test(record.get('signing_city'))) {
// $L.showErrorMessage('提示', '合同签订地建议格式：“xx市xx区”（也可填写详细地址）!');
// return false;
// }
if (record.get('signing_city').indexOf('州') == -1 && record.get('signing_city').indexOf('县') == -1 && record.get('signing_city').indexOf('区') == -1) {
Leaf.showConfirm('${HLS.PROMPT}', '合同签订地所填写内容，未细化到区/县/州级别，是否确认？', function () {});
}
}
}
......@@ -807,22 +822,48 @@
}
if (ds_id == ds.id && ds_id) {
division=record.get('division');
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(division!='91') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//“新机二次租赁”字段仅展示在神钢产品线的页面中，其余产品线不展示
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'none';
}else {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'block';
// 神钢建机时，当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (record.get('secondary_lease') == 'YES' || record.get('secondary_lease_new') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO' && record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
//业务类型回租时，默认只读“首付款抵扣”选项
if (record.get('business_type') == 'LEASEBACK') {
......@@ -958,16 +999,16 @@
//选择承租人带出开票信息
if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if (name == "payment_deduction" && value=="DOWN_PAYMENT_DEDUCTION") {
//业务类型回租时，默认只读“首付款抵扣”选项
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
Leaf.showInfoMessage("提示", "直租业务不能选择首付款抵扣");
setTimeout(function () {
$(prj_project_ds_id).getAt(0).set('payment_deduction', null);
$(prj_project_ds_id).getAt(0).set('payment_deduction_n', null);
}, 10);
//业务类型回租时，默认只读“首付款抵扣”选项
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
Leaf.showInfoMessage("提示", "直租业务不能选择首付款抵扣");
setTimeout(function () {
$(prj_project_ds_id).getAt(0).set('payment_deduction', null);
$(prj_project_ds_id).getAt(0).set('payment_deduction_n', null);
}, 10);
}
}
}
if (name == "bp_id_tenant_n" && value) {
var bp_id_tenant = record.get('bp_id_tenant');
Leaf.Masker.mask(Ext.getBody());
......@@ -1075,26 +1116,86 @@
}
//add by niminmin
//当“二次租赁”字段选择‘是’时，“回购合同编号”字段为必填。当选择‘否’时，“回购合同编号”字段为只读。
if (name == 'secondary_lease') {
if (value=='YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if(value=='NO'){
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id',null);
record.set('repur_contract_id_n',null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
if(record.get('division') !='91') {
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}else {
//当“旧机二次租赁”、“新机二次租赁”中任意一个为“是”，则系统提示只能任选其一(两个都选择是，则提示)
//当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (name == 'secondary_lease_new'){
if (value == 'YES') {
if (record.get('secondary_lease') == 'YES') {
record.set('secondary_lease_new','NO');
record.set('secondary_lease_new_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
if (name == 'secondary_lease'){
if (value == 'YES') {
if (record.get('secondary_lease_new') == 'YES') {
record.set('secondary_lease','NO');
record.set('secondary_lease_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
}
//新增 “限制金额”字段；
//“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
if (name=='pay_method') {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 62cf254f
......@@ -855,23 +855,83 @@
}
//add by niminmin
//当“二次租赁”字段选择‘是’时，“回购合同编号”字段为必填。当选择‘否’时，“回购合同编号”字段为只读。
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(record.get('division') !='91') {
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}else {
//当“旧机二次租赁”、“新机二次租赁”中任意一个为“是”，则系统提示只能任选其一(两个都选择是，则提示)
//当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (name == 'secondary_lease_new'){
if (value == 'YES') {
if (record.get('secondary_lease') == 'YES') {
record.set('secondary_lease_new','NO');
record.set('secondary_lease_new_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
if (name == 'secondary_lease'){
if (value == 'YES') {
if (record.get('secondary_lease_new') == 'YES') {
record.set('secondary_lease','NO');
record.set('secondary_lease_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
}
//新增 “限制金额”字段；
......@@ -1078,31 +1138,73 @@
document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
record.getField('deduction_limit').setRequired(false);
}
if ('${/parameter/@function_usage}' != 'QUERY') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if('${/parameter/@function_usage}'!='QUERY') {
if(division!='91') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//“新机二次租赁”字段仅展示在神钢产品线的页面中，其余产品线不展示
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'none';
}else {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'block';
// 神钢建机时，当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (record.get('secondary_lease') == 'YES' || record.get('secondary_lease_new') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO' && record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
} else {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(division!='91') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//“新机二次租赁”字段仅展示在神钢产品线的页面中，其余产品线不展示
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'none';
}else {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'block';
// 神钢建机时，当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (record.get('secondary_lease') == 'YES' || record.get('secondary_lease_new') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO' && record.get('secondary_lease_new') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
//业务类型回租时，默认只读“首付款抵扣”选项
......@@ -1916,6 +2018,18 @@
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
debugger;
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同！');
return false;
}
}
}
return true;
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 62cf254f
......@@ -324,10 +324,13 @@
return false;
}
if (record.get('signing_city')){
var reg = /^([\u2E80-\u9FFF]){4,}$/;
if (!reg.test(record.get('signing_city'))) {
$L.showErrorMessage('提示', '合同签订地请输入**市**区!');
return false;
// var reg = /^([\u2E80-\u9FFF]){4,}$/;
// if (!reg.test(record.get('signing_city'))) {
// $L.showErrorMessage('提示', '合同签订地请输入**市**区!');
// return false;
// }
if (record.get('signing_city').indexOf('州') == -1 && record.get('signing_city').indexOf('县') == -1 && record.get('signing_city').indexOf('区') == -1) {
Leaf.showConfirm('${HLS.PROMPT}', '合同签订地所填写内容，未细化到区/县/州级别，是否确认？', function () {});
}
}
}
......@@ -406,6 +409,18 @@
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
debugger;
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同！');
return false;
}
}
}
if(!bp_rate_flag){
return false;
}
......@@ -930,30 +945,72 @@
record.getField('deduction_limit').setRequired(false);
}
if('${/parameter/@function_usage}'!='QUERY') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(division!='91') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//“新机二次租赁”字段仅展示在神钢产品线的页面中，其余产品线不展示
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'none';
}else {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'block';
// 神钢建机时，当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (record.get('secondary_lease') == 'YES' || record.get('secondary_lease_new') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO' && record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
} else {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(division!='91') {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//“新机二次租赁”字段仅展示在神钢产品线的页面中，其余产品线不展示
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'none';
}else {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_SECONDARY_LEASE_NEW').style.display = 'block';
// 神钢建机时，当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (record.get('secondary_lease') == 'YES' || record.get('secondary_lease_new') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO' && record.get('secondary_lease_new') == 'NO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
......@@ -1314,23 +1371,83 @@
}
//add by niminmin
//当“二次租赁”字段选择‘是’时，“回购合同编号”字段为必填。当选择‘否’时，“回购合同编号”字段为只读。
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
if(record.get('division') !='91') {
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}else {
//当“旧机二次租赁”、“新机二次租赁”中任意一个为“是”，则系统提示只能任选其一(两个都选择是，则提示)
//当“旧机二次租赁”、 “新机二次租赁”中任意一个为“是”，则校验结清合同号必填
if (name == 'secondary_lease_new'){
if (value == 'YES') {
if (record.get('secondary_lease') == 'YES') {
record.set('secondary_lease_new','NO');
record.set('secondary_lease_new_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
if (name == 'secondary_lease'){
if (value == 'YES') {
if (record.get('secondary_lease_new') == 'YES') {
record.set('secondary_lease','NO');
record.set('secondary_lease_n','否');
Leaf.showMessage('${l:HLS.PROMPT}', '旧机二次租赁、新机二次租赁只能任选其一！');
return false;
}
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if (value == 'NO') {
if (record.get('secondary_lease_new') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
}
}
//新增 “限制金额”字段；
......
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