Commit 340f4635 authored by xsh241908's avatar xsh241908

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
parents d31f9fb9 c079ea21
...@@ -22,6 +22,9 @@ values ('CONTRACT', 'CON_CONTRACT_REPO_MODIFY_LV', 'VIEW', -1, sysdate, -1, sysd ...@@ -22,6 +22,9 @@ values ('CONTRACT', 'CON_CONTRACT_REPO_MODIFY_LV', 'VIEW', -1, sysdate, -1, sysd
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE) insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate); values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate);
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate);
end; end;
/ /
commit; commit;
......
...@@ -9,6 +9,9 @@ set define off ...@@ -9,6 +9,9 @@ set define off
begin begin
sys_function_assign_pkg.func_bm_load('ZJWFL5110','zjwfl.ZJWFL5110.cus_zj_wfl_instance_node_recipient'); sys_function_assign_pkg.func_bm_load('ZJWFL5110','zjwfl.ZJWFL5110.cus_zj_wfl_instance_node_recipient');
sys_function_assign_pkg.func_bm_load('ZJWFL5110','basic.hls_bp_master_v_for_agent_lov');
sys_function_assign_pkg.func_bm_load('acr.ACR515.acr515_invoice_hd_v','acr.ACR515.acr515_invoice_hd_v');
end; end;
/ /
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
SELECT * SELECT vv.*,(select v.code_value_name value_name from sys_code_values_v v where v.code ='YES_NO' and v.code_value = vv.rl_flag) rl_flag_n
FROM (select t2.journal_line_id, FROM (select t2.journal_line_id,
t2.journal_header_id, t2.journal_header_id,
cc.company_id, cc.company_id,
...@@ -78,7 +78,19 @@ ...@@ -78,7 +78,19 @@
cc.termination_date, cc.termination_date,
cc.lease_channel, cc.lease_channel,
t2.cf_direction, t2.cf_direction,
t2.billing_status, nvl(t2.billing_status,'NOT') billing_status,
(select v.code_value_name value_name from sys_code_values_v v where v.code ='CON_BILLING_STATUS' and v.code_value = nvl(t2.billing_status,'NOT')) billing_status_n,
case when acr_invoice_pkg.check_rl_cf_flag(cc.contract_id,t2.cf_item,t2.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(cc.contract_id) = 'Y'
then
'Y'
when acr_invoice_pkg.check_rl_cf_flag(cc.contract_id,t2.cf_item,t2.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(cc.contract_id) = 'N'
then
'N'
else
''
end rl_flag,
t2.cf_status, t2.cf_status,
cc.business_type, cc.business_type,
(SELECT bt.description (SELECT bt.description
...@@ -324,7 +336,8 @@ ...@@ -324,7 +336,8 @@
<bm:query-field name="invoice_method" queryExpression="vv.invoice_method = ${@invoice_method}"/> <bm:query-field name="invoice_method" queryExpression="vv.invoice_method = ${@invoice_method}"/>
<bm:query-field name="division" queryExpression="vv.division = ${@division}"/> <bm:query-field name="division" queryExpression="vv.division = ${@division}"/>
<bm:query-field name="invoice_type" queryExpression="vv.invoice_type = ${@invoice_type}"/> <bm:query-field name="invoice_type" queryExpression="vv.invoice_type = ${@invoice_type}"/>
<bm:query-field name="rl_flag" queryExpression="vv.rl_flag = ${@rl_flag}"/>
<bm:query-field name="billing_status" queryExpression="vv.billing_status = ${@billing_status}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="vv.contract_status not in ('CANCEL')"/> <bm:data-filter enforceOperations="query" expression="vv.contract_status not in ('CANCEL')"/>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<bm:field name="cf_status" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="cf_status" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/> <bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/>
<bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/> <bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/>
<bm:field name="rl_flag"/>
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
...@@ -56,12 +56,13 @@ ...@@ -56,12 +56,13 @@
where m.bp_id =t.bp_id) billing_object_name, where m.bp_id =t.bp_id) billing_object_name,
t.due_amount, t.due_amount,
-- t.billing_amount, /*-- t.billing_amount,
(case when cf.cf_item= 1 and cf.cf_status='BLOCK' then (case when cf.cf_item= 1 and cf.cf_status='BLOCK' then
t.received_amount-nvl(t.cf_billing_amount,0) t.received_amount-nvl(t.cf_billing_amount,0)
else else
t.due_amount-nvl(t.cf_billing_amount,0) t.due_amount-nvl(t.cf_billing_amount,0)
end )billing_amount, end )billing_amount,*/
t.billing_amount,
t.cf_billing_amount, t.cf_billing_amount,
t.received_amount, t.received_amount,
t.contract_id, t.contract_id,
...@@ -101,6 +102,17 @@ ...@@ -101,6 +102,17 @@
from sys_code_values_v v from sys_code_values_v v
where v.code = 'ACR512_INVOICE_KIND_TYPE' where v.code = 'ACR512_INVOICE_KIND_TYPE'
and v.code_value = t.invoice_kind_type) invoice_kind_type_n and v.code_value = t.invoice_kind_type) invoice_kind_type_n
, case when acr_invoice_pkg.check_rl_cf_flag(con.contract_id,cf.cf_item,cf.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(con.contract_id) = 'Y'
then
'Y'
when acr_invoice_pkg.check_rl_cf_flag(con.contract_id,cf.cf_item,cf.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(con.contract_id) = 'N'
then
'N'
else
''
end rl_flag
from acr_invoice_create_tmp t, from acr_invoice_create_tmp t,
con_contract_v con, con_contract_v con,
con_contract_cashflow_all_v cf, con_contract_cashflow_all_v cf,
......
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544 and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80')) AND v.code_value IN ('10', '20', '30', '40','50','70','80','90'))
UNION ALL UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y' WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y' AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION' AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80') AND v.code_value IN ('10', '20', '30', '40','50','70','80','90')
AND NOT EXISTS (SELECT 1 AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: lijingjing $Author: lijingjing
$Date: 2018-11_03 上午11:00:06 $Date: 2018-11_03 上午11:00:06
$Revision: 3.0 $Revision: 3.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
prj_project_check_pkg.check_prj_lease_item( prj_project_check_pkg.check_prj_lease_item(
p_project_id =>${@project_id},
p_machine_number =>${@machine_number}, p_machine_number =>${@machine_number},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
...@@ -18,5 +19,5 @@ ...@@ -18,5 +19,5 @@
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
</bm:model> </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
contract_phone_change.phone_commit(p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select v.user_id,
v.user_name,
v.description authorized_user_desc,
v.employee_code,
v.employee_name
from sys_user_v v
where
v.user_id = ${/session/@user_id}
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
business_daily_pkg.business_daily_bmp(
p_file_path =>${@p_file_path},
p_file_name =>${@p_file_name},
p_file_size =>${@p_file_size},
p_user_id =>${@p_user_id}
);
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" dataSourceName="u8" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select v.parameter_value
from sys_parameter_values v,sys_parameters p
where v.module_id = p.module_id
and p.parameter_code ='${:@parameter_code}'
and v.parameter_id = p.parameter_id
and v.level_id = 101
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select v.parameter_value
from sys_parameter_values v,sys_parameters p
where v.module_id = p.module_id
and p.parameter_code ='${:@parameter_code}'
and v.parameter_id = p.parameter_id
and v.level_id = 101
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="parameter_value"/>
</bm: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 (select nvl(sum(nvl(ci.set_number, 1)), 0)
from con_contract cc, con_contract_lease_item ci
where cc.lease_start_date = TRUNC(sysdate )
and ci.contract_id = cc.contract_id
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL') day_num, --日台数
nvl((select to_char(round(sum(nvl(cc.total_rental, 0)) +
sum(nvl(cc.residual_value, 0)),2),'fm99999999999990.00')
from con_contract cc
where cc.lease_start_date = TRUNC(sysdate )
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL'),
0) day_money, --日金额
(select nvl(sum(nvl(ci.set_number, 1)),0)
from con_contract cc, con_contract_lease_item ci
where cc.lease_start_date between trunc(sysdate, 'mm') and
trunc(sysdate)
and ci.contract_id = cc.contract_id
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL') month_num, --月数量
nvl((select to_char(round(sum(nvl(cc.total_rental, 0)) +
sum(nvl(cc.residual_value, 0)),2),'fm99999999999990.00')
from con_contract cc
where cc.lease_start_date between trunc(sysdate, 'mm') and
trunc(sysdate)
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL'),
0) month_money, --月金额
case
when trunc(sysdate) >
to_date(to_char(sysdate, 'yyyy') || '0331', 'yyyymmdd') then
(select sum(nvl(ci.set_number, 1))
from con_contract cc, con_contract_lease_item ci
where cc.lease_start_date between
to_date(to_char(sysdate, 'yyyy') || '0401', 'yyyymmdd') and
to_date(to_char(add_months(sysdate, 12), 'yyyy') || '0331',
'yyyymmdd')
and ci.contract_id = cc.contract_id
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL')
else
(select sum(nvl(ci.set_number, 1))
from con_contract cc, con_contract_lease_item ci
where cc.lease_start_date between
to_date(to_char(add_months(sysdate, -12), 'yyyy') ||
'0401',
'yyyymmdd') and
to_date(to_char(sysdate, 'yyyy') || '0331', 'yyyymmdd')
and cc.contract_status = 'INCEPT'
and ci.contract_id = cc.contract_id
and cc.data_class = 'NORMAL')
end as year_num, --年台数
(case
when trunc(sysdate) >
to_date(to_char(sysdate, 'yyyy') || '0331', 'yyyymmdd') then
(select to_char(round(sum(nvl(cc.total_rental, 0)) +
sum(nvl(cc.residual_value, 0)),2),'fm99999999999990.00')
from con_contract cc
where cc.lease_start_date between
to_date(to_char(sysdate, 'yyyy') || '0401', 'yyyymmdd') and
to_date(to_char(add_months(sysdate, 12), 'yyyy') || '0331',
'yyyymmdd')
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL')
else
(select to_char(round(sum(nvl(cc.total_rental, 0)) +
sum(nvl(cc.residual_value, 0)),2),'fm99999999999990.00')
from con_contract cc
where cc.lease_start_date between
to_date(to_char(add_months(sysdate, -12), 'yyyy') ||
'0401',
'yyyymmdd') and
to_date(to_char(sysdate, 'yyyy') || '0331', 'yyyymmdd')
and cc.contract_status = 'INCEPT'
and cc.data_class = 'NORMAL')
end) year_money, --年金额
(select nvl(sum(nvl(ci.set_number, 1)), 0)
from con_contract cc, con_contract_lease_item ci
where (cc.contract_status in ('INCEPT', 'REPURING', 'ETING') or
(cc.contract_status = 'PENDING' and cc.project_id is not null and
exists
(select 1
from zj_wfl_workflow_instance_v zw,
ZJ_WFL_WORKFLOW_INSTANCE_PARA zi,
zj_wfl_workflow_type_parameter zp
where zw.workflow_code = 'CONTRACT_INCEPT_WFL'
and zw.instance_status = '10'
and zi.workflow_type_para_id = zp.workflow_type_para_id
and zp.parameter_code = 'CONTRACT_ID'
and zw.instance_id = zi.instance_id
and to_char(cc.contract_id) = zi.parameter_value))or
(cc.contract_status = 'PENDING' and
cc.project_id is null))
and ci.contract_id = cc.contract_id
and cc.lease_start_date <= TRUNC(sysdate )
and cc.data_class = 'NORMAL') all_num, --昨日资产台数
nvl((select to_char(round(sum(ccc.due_amount) - sum(nvl(ccc.received_amount, 0)),2),'fm99999999999990.00')
from con_contract_cashflow ccc
where ccc.contract_id in
(select cc.contract_id
from con_contract cc
where (cc.contract_status in
('INCEPT', 'REPURING', 'ETING') or
(cc.contract_status = 'PENDING' and
cc.project_id is not null and exists
(select 1
from zj_wfl_workflow_instance_v zw,
ZJ_WFL_WORKFLOW_INSTANCE_PARA zi,
zj_wfl_workflow_type_parameter zp
where zw.workflow_code = 'CONTRACT_INCEPT_WFL'
and zw.instance_status = '10'
and zi.workflow_type_para_id =
zp.workflow_type_para_id
and zp.parameter_code = 'CONTRACT_ID'
and zw.instance_id = zi.instance_id
and to_char(cc.contract_id) =
zi.parameter_value))or
(cc.contract_status = 'PENDING' and
cc.project_id is null))
and cc.lease_start_date <= TRUNC(sysdate)
and cc.data_class = 'NORMAL')
and ccc.cf_status = 'RELEASE'
and ccc.cf_item in (1, 8, 9,250,200,11)),
0) all_money --昨日资产金额
from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select to_char(t.bp_birth, 'yyyy-mm-dd') bp_birth,
t.BP_MARRIAGE,
bp_marriage_n,
t.BP_HEALTH,
t.BP_HEALTH_n,
t.BP_BORN,
t.BP_BORN_n,
t.PROPERTY_BELONG,
t.PROPERTY_BELONG_n,
t.OWN_PROPERTY_ADDRESS,
t.HOUSE_AREA,
t.HOUSE_VALUE,
t.OWN_MONEY,
t.BANK_CREDIT_APPROVAL,
t.BANK_CREDIT_APPROVAL_n,
t.OTHER_OWN_ASSETS,
t.FAMILY_SOURCE_INCOME,
t.FAMILY_AVG_INCOME,
t.FAMILY_MONTH_AVG_OUTCOME,
t.BANK_LOAN,
t.OTHER_LOAN,
t.FIXED_ASSETS,
t.CAPITAL,
t.CAPITAL_PLACE,
t.CAR_TYPE,
t.CAR_BRAND,
t.CAR_NUM,
t.CAR_BUY_DATE,
t.CAR_BUY_MONEY,
t.WORK_EXPERIENCE,
t.WORK_EXPERIENCE_n,
t.WORK_OPERATOR,
t.WORK_OPERATOR_n,
t.WORK_TYPE,
t.WORK_TYPE_n,
t.WORK_AVG_MONTH_INCOME,
t.WORK_AVG_MONTH_OUTCOME,
t.OTHER_DESCRIPTION,
t.PAYMENT_SOURCE,
t.E_PLACE,
t.E_CONTRACT_AMOUNT,
t.CONTRACT_COPY,
t.CONTRACT_COPY_n,
t.E_CON_AUTHENTICITY,
t.E_CON_AUTHENTICITY_n,
t.SURVEY_FIT,
t.SURVEY_FIT_n,
t.DAILY_CREDIT,
t.DAILY_CREDIT_n,
t.BORROW_SITUATION,
t.BORROW_SITUATION_n,
t.RENT_REPAYMENT,
t.RENTAL_BALANCE,
t.LIQUIDATED_DAMAGES,
t.GUAR_MORTGAGE_STATUS,
t.GUAR_MORTGAGE_STATUS_n,
t.PAST_CONT_EXE_STATUS,
t.PAST_CONT_EXE_STATUS_n,
t.INDUSTRY_JUDGEMENT,
t.INDUSTRY_JUDGEMENT_n,
t.THIRD_PARTY_GUARANTEE,
t.THIRD_PARTY_GUARANTEE_n,
t.THIRD_PARTY_CREDIBILITY,
t.THIRD_PARTY_CREDIBILITY_n,
t.E_PLACE_n,
t.BP_AGE,
t.score_name,
t.third_guar_score
from (select a.*
from (select t1.bp_birth,
t1.BP_MARRIAGE,
t1.bp_marriage_n,
t1.BP_HEALTH,
t1.BP_HEALTH_n,
t1.BP_BORN,
t1.BP_BORN_n,
t1.PROPERTY_BELONG,
t1.PROPERTY_BELONG_n,
t1.OWN_PROPERTY_ADDRESS,
t1.HOUSE_AREA,
t1.HOUSE_VALUE,
t1.OWN_MONEY,
t1.BANK_CREDIT_APPROVAL,
t1.BANK_CREDIT_APPROVAL_n,
t1.OTHER_OWN_ASSETS,
t1.FAMILY_SOURCE_INCOME,
t1.FAMILY_AVG_INCOME,
t1.FAMILY_MONTH_AVG_OUTCOME,
t1.BANK_LOAN,
t1.OTHER_LOAN,
t1.FIXED_ASSETS,
t1.CAPITAL,
t1.CAPITAL_PLACE,
t1.CAR_TYPE,
t1.CAR_BRAND,
t1.CAR_NUM,
t1.CAR_BUY_DATE,
t1.CAR_BUY_MONEY,
t1.WORK_EXPERIENCE,
t1.WORK_EXPERIENCE_n,
t1.WORK_OPERATOR,
t1.WORK_OPERATOR_n,
t1.WORK_TYPE,
t1.WORK_TYPE_n,
t1.WORK_AVG_MONTH_INCOME,
t1.WORK_AVG_MONTH_OUTCOME,
t1.OTHER_DESCRIPTION,
t1.PAYMENT_SOURCE,
t1.E_PLACE,
t1.E_CONTRACT_AMOUNT,
t1.CONTRACT_COPY,
t1.CONTRACT_COPY_n,
t1.E_CON_AUTHENTICITY,
t1.E_CON_AUTHENTICITY_n,
t1.SURVEY_FIT,
t1.SURVEY_FIT_n,
t1.DAILY_CREDIT,
t1.DAILY_CREDIT_n,
t1.BORROW_SITUATION,
t1.BORROW_SITUATION_n,
t1.RENT_REPAYMENT,
t1.RENTAL_BALANCE,
t1.LIQUIDATED_DAMAGES,
t1.GUAR_MORTGAGE_STATUS,
t1.GUAR_MORTGAGE_STATUS_n,
t1.PAST_CONT_EXE_STATUS,
t1.PAST_CONT_EXE_STATUS_n,
t1.INDUSTRY_JUDGEMENT,
t1.INDUSTRY_JUDGEMENT_n,
t1.THIRD_PARTY_GUARANTEE,
t1.THIRD_PARTY_GUARANTEE_n,
t1.THIRD_PARTY_CREDIBILITY,
t1.THIRD_PARTY_CREDIBILITY_n,
t1.E_PLACE_n,
t1.BP_AGE,
t1.score_name,
t1.third_guar_score,
t1.tj_score
from bp_tenant_rate_detail_v t1
where exists
(select 1
from prj_project p
where p.project_id = t1.PROJECT_ID
and p.bp_id_tenant = ${@bp_id}
and p.project_status not in ('CLOSED'))
order by t1.project_id desc) a
where rownum = 1
union
SELECT h.date_of_birth bp_birth,
h.marital_status bp_marriage,
(SELECT code_value_name
FROM sys_code_values_v
WHERE code LIKE 'MARITAL_STATUS'
AND code_value_enabled_flag = 'Y'
AND code_value = h.marital_status) bp_marriage_n,
null BP_HEALTH,
null BP_HEALTH_n,
null BP_BORN,
null BP_BORN_n,
null PROPERTY_BELONG,
null PROPERTY_BELONG_n,
null OWN_PROPERTY_ADDRESS,
null HOUSE_AREA,
null HOUSE_VALUE,
null OWN_MONEY,
null BANK_CREDIT_APPROVAL,
null BANK_CREDIT_APPROVAL_n,
null OTHER_OWN_ASSETS,
null FAMILY_SOURCE_INCOME,
null FAMILY_AVG_INCOME,
null FAMILY_MONTH_AVG_OUTCOME,
null BANK_LOAN,
null OTHER_LOAN,
null FIXED_ASSETS,
null CAPITAL,
null CAPITAL_PLACE,
null CAR_TYPE,
null CAR_BRAND,
null CAR_NUM,
null CAR_BUY_DATE,
null CAR_BUY_MONEY,
null WORK_EXPERIENCE,
null WORK_EXPERIENCE_n,
null WORK_OPERATOR,
null WORK_OPERATOR_n,
h.industry work_type,
(SELECT code_value_name
FROM sys_code_values_v
WHERE code LIKE 'INDUSTRY_HL'
AND code_value_enabled_flag = 'Y'
AND code_value = h.industry) WORK_TYPE_n,
null WORK_AVG_MONTH_INCOME,
null WORK_AVG_MONTH_OUTCOME,
null OTHER_DESCRIPTION,
null PAYMENT_SOURCE,
null E_PLACE,
null E_CONTRACT_AMOUNT,
null CONTRACT_COPY,
null CONTRACT_COPY_n,
null E_CON_AUTHENTICITY,
null E_CON_AUTHENTICITY_n,
null SURVEY_FIT,
null SURVEY_FIT_n,
null DAILY_CREDIT,
null DAILY_CREDIT_n,
null BORROW_SITUATION,
null BORROW_SITUATION_n,
null RENT_REPAYMENT,
null RENTAL_BALANCE,
null LIQUIDATED_DAMAGES,
null GUAR_MORTGAGE_STATUS,
null GUAR_MORTGAGE_STATUS_n,
null PAST_CONT_EXE_STATUS,
null PAST_CONT_EXE_STATUS_n,
null INDUSTRY_JUDGEMENT,
null INDUSTRY_JUDGEMENT_n,
null THIRD_PARTY_GUARANTEE,
null THIRD_PARTY_GUARANTEE_n,
null THIRD_PARTY_CREDIBILITY,
null THIRD_PARTY_CREDIBILITY_n,
null E_PLACE_n,
null BP_AGE,
DECODE(h.bp_class, 'NP',h.bp_name, 'ORG', h.legal_person) score_name,
null third_guar_score,
null tj_score
FROM hls_bp_master h
where h.bp_id = ${@bp_id}) t
where rownum = 1
]]></bm:query-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:fields>
<bm:field name="contract_id"/>
<bm:field name="contract_number" forDisplay="true" forQuery="true" prompt="HLS.CONTRACT_NUMBER"/>
<bm:field name="contract_name" forDisplay="true" forQuery="true" prompt="HLS.CONTRACT_NAME" displayWidth="350"/>
<bm:field name="bp_id_tenant"/>
<bm:field name="bp_name"/>
<bm:field name="bp_id_agent_level1"/>
<bm:field name="bp_id_agent_level1_n"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from (select cc.contract_id,
cc.contract_number,
cc.contract_name,
cc.bp_id_agent_level1,
(SELECT hb.bp_name
FROM hls_bp_master hb
WHERE hb.bp_id = cc.bp_id_agent_level1) bp_id_agent_level1_n,
cc.bp_id_tenant,
(SELECT hb.bp_name
FROM hls_bp_master hb
WHERE hb.bp_id = cc.bp_id_tenant) bp_name
from con_contract cc
where cc.data_class = 'NORMAL'
and acr_invoice_pkg.check_rl_flag(cc.contract_id) = 'Y') t1
#WHERE_CLAUSE# #ORDER_BY_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field field="contract_number" queryOperator="like"/>
<!--<bm:query-field name="bp_id_agent_level1" queryExpression="((t1.bp_id_agent_level1=${@bp_id_agent_level1}) or exists (select 1 from con_contract_lease_item ccli,hls_lease_item hli where ccli.lease_item_id=hli.lease_item_id and hli.vender_id=${@bp_id_agent_level1} and t1.contract_id=ccli.contract_id))"/>-->
<bm:query-field field="bp_id_tenant" queryExpression="t1.bp_id_tenant=${@bp_id_tenant}" />
<bm:query-field name="contract_name" queryExpression="t1.contract_name like &apos;%&apos;||${@contract_name}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
...@@ -100,6 +100,13 @@ ...@@ -100,6 +100,13 @@
<bm:field name="acc_confirmed_by"/> <bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/> <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/> <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from csh_write_off cw, hls_journal_header h where cw.write_off_type = 'REFUND_ENTRY' and cw.csh_transaction_id = h.source_id and h.source_table = 'CSH_TRANSACTION' and t1.source_doc_type = cw.write_off_type and t1.source_doc_id = cw.write_off_id and exists (select 1 from hls_journal_detail d where h.journal_header_id = d.journal_header_id and cw.write_off_id = d.cashflow_id))"/>
<bm:field name="return_sbo" forInsert="false" forUpdate="false" expression="(select listagg(h.sbo_num, ',') WITHIN group(order by h.journal_num) from hls_journal_header h,csh_transaction ct where h.source_table = 'CSH_TRANSACTION' and h.source_id = ct.transaction_id and ct.return_from_csh_trx_id = t1.transaction_id and ct.returned_flag = 'RETURN')"/>
<bm:field name="tenant_account_id" forInsert="false" forUpdate="false" expression="(select cc.bank_account_id from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="tenant_account_num" forInsert="false" forUpdate="false" expression="(select ha.bank_account_num from con_contract cc,hls_bp_master_bank_account ha where cc.contract_id = t1.ref_contract_id and ha.bank_account_id = cc.bank_account_id)"/>
<bm:field name="tenant_account_name" forInsert="false" forUpdate="false" expression="(select ha.bank_account_name from con_contract cc,hls_bp_master_bank_account ha where cc.contract_id = t1.ref_contract_id and ha.bank_account_id = cc.bank_account_id)"/>
<bm:field name="tenant_bank_name" forInsert="false" forUpdate="false" expression="(select ha.bank_full_name from con_contract cc,hls_bp_master_bank_account ha where cc.contract_id = t1.ref_contract_id and ha.bank_account_id = cc.bank_account_id)"/>
<bm:field name="return_date" forInsert="false" forUpdate="false" expression="(select listagg(to_char(ct.transaction_date,'yyyy-mm-dd'), ',') WITHIN group(order by ct.transaction_date) from csh_transaction ct where ct.return_from_csh_trx_id = t1.transaction_id and ct.returned_flag = 'RETURN')"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
...@@ -109,7 +116,7 @@ ...@@ -109,7 +116,7 @@
</bm:primary-key> </bm:primary-key>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and returned_flag not in ( &apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;=t1.transaction_amount)) "/> <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and returned_flag not in ( &apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;=t1.transaction_amount)) "/>
<!-- <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>--> <!-- <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>-->
<bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;))"/> <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;))"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
......
...@@ -17,7 +17,22 @@ ...@@ -17,7 +17,22 @@
(select u.employee_name (select u.employee_name
from sys_user_v u from sys_user_v u
where u.user_id = r.created_by) user_desc, where u.user_id = r.created_by) user_desc,
t.transaction_num t.transaction_num,
(SELECT listagg(h.sbo_num,',') within group (order by h.source_id)
from hls_journal_header h
WHERE r.return_transaction_id = h.source_id
and h.source_table = 'CSH_TRANSACTION') sbo_num,
(SELECT h.sbo_num
from csh_transaction ct, csh_write_off cw, hls_journal_header h
WHERE r.transaction_id = ct.transaction_id
and ct.source_doc_type = cw.write_off_type
and ct.source_doc_id = cw.write_off_id
and h.source_table = 'CSH_TRANSACTION'
and h.source_id = cw.csh_transaction_id
and exists (select 1
from hls_journal_detail d
where h.journal_header_id = d.journal_header_id
and cw.write_off_id = d.cashflow_id)) receipt_sbo_num
FROM csh_transaction_return r, FROM csh_transaction_return r,
csh_transaction t csh_transaction t
--hls_bp_master_bank_account v --hls_bp_master_bank_account v
......
...@@ -174,5 +174,6 @@ ...@@ -174,5 +174,6 @@
<bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT'))) and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/> <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT'))) and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
<!-- <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />--> <!-- <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />-->
<bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} = 1))))"/> <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} = 1))))"/>
<bm:data-filter name="collection_classes" expression="(nvl(t1.collection_classes,'NON') != 'REFUND')"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
\ No newline at end of file
...@@ -110,6 +110,15 @@ ...@@ -110,6 +110,15 @@
} }
} }
function remove_query_field(name) {
importClass(Packages.uncertain.composite.CompositeUtil);
var qf_root = $this.getObjectContext().getChild("query-fields");
var query_field = CompositeUtil.findChild(qf_root, "query-field", "field", name);
if (query_field) {
qf_root.removeChild(query_field);
}
}
function import_server_bm_tplt() { function import_server_bm_tplt() {
var cx = Packages.leaf.javascript.Context.getCurrentContext(); var cx = Packages.leaf.javascript.Context.getCurrentContext();
try { try {
......
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
NULL,
NULL,
NULL NULL
FROM hls_bp_master h) FROM hls_bp_master h)
ORDER BY bp_detail_id DESC) t1 ORDER BY bp_detail_id DESC) t1
......
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
AND cf_status = 'RELEASE' AND cf_status = 'RELEASE'
AND cf_item = 8) residual_date, AND cf_item = 8) residual_date,
-- 合同终了 -- 合同终了
(CASE /*(CASE
WHEN ct.contract_status IN ('INCEPT', 'ETING', 'TERMINATE', 'ET') THEN WHEN ct.contract_status IN ('INCEPT', 'ETING', 'TERMINATE', 'ET') THEN
(SELECT to_char(MAX(cc.last_received_date),'yyyy-mm-dd') (SELECT to_char(MAX(cc.last_received_date),'yyyy-mm-dd')
FROM con_contract_cashflow cc FROM con_contract_cashflow cc
...@@ -657,7 +657,8 @@ ...@@ -657,7 +657,8 @@
AND cf_item = 250) AND cf_item = 250)
ELSE ELSE
'' ''
END) terminate_date, END) terminate_date,*/
to_char(ct.et_date, 'yyyy-mm-dd') terminate_date,
ct.is_buyout, ct.is_buyout,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
...@@ -681,7 +682,85 @@ ...@@ -681,7 +682,85 @@
WHERE v.code = 'BRANCH_CODE_SZMP' WHERE v.code = 'BRANCH_CODE_SZMP'
AND v.code_enabled_flag = 'Y' AND v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y' AND v.code_value_enabled_flag = 'Y'
AND v.code_value = ct.branch_code) branch_code_n AND v.code_value = ct.branch_code) branch_code_n,
(select decode(bp.bp_class, 'NP', '自然人', '法人')
from con_contract_bp bp
where bp.contract_id = ct.contract_id
and bp.bp_category = 'TENANT') bp_class_n,
(select b.description
from hls_business_type b
where b.business_type = ct.business_type) business_type_n,
NVL((Select h1.code_value_name value_name
From sys_code_values_v h1
Where h1.code = 'SECONDARY_LEASE'
And h1.code_enabled_flag = 'Y'
And h1.code_value_enabled_flag = 'Y'
AND H1.code_value = CT.SECONDARY_LEASE),
'否') SECONDARY_LEASE_N,
(select d.description from hls_division d where d.division = ct.division) division_n,
nvl((select '是'
from con_contract_change_req ccr
where ccr.contract_id = ct.contract_id
and ccr.req_status = 'APPROVED'
and ccr.document_type = 'LEASE_CHAG'
and rownum = 1),
'否') tenant_change_flag_n,
nvl((select '是'
from dual
where not exists (select 1
from con_contract_cashflow ccc
where ccc.cf_item = 1
and ccc.times <= 12
and ccc.contract_id = ct.contract_id
and ccc.write_off_flag != 'FULL'
and ccc.cf_direction = 'INFLOW')
and exists (select 1
from con_contract_cashflow ccc
where ccc.cf_item = 1
and ccc.times = 12
and ccc.contract_id = ct.contract_id
and ccc.write_off_flag = 'FULL'
and ccc.cf_direction = 'INFLOW')),
'否') rental_12_pay_flag,
nvl((select '是'
from con_contract_cashflow ccc
where ccc.cf_item = 9
and ccc.cf_direction = 'INFLOW'
and ccc.contract_id = ct.contract_id
and (ccc.due_amount > 0 or exists
(select 1
from CON_CONTRACT_CASE_RECORD cr,
CON_CONTRACT_PENALTY_REDUCE pr,
CON_CONTRACT_PENALTY_INFO pi
where cr.record_id = pr.record_id
and pr.penalty_reduce_id = pi.penalty_reduce_id
and pr.contract_id = ccc.contract_id
and pi.penalty_reduce_amount > 0
and cr.status = 'APPROVED'))
and rownum = 1),
'否') cf_9_exists_flag,
nvl((select '是'
from con_contract_cashflow ccc
where ccc.cf_item = 9
and ccc.cf_direction = 'INFLOW'
and ccc.contract_id = ct.contract_id
and (ccc.due_amount > 0 or exists
(select 1
from CON_CONTRACT_CASE_RECORD cr,
CON_CONTRACT_PENALTY_REDUCE pr,
CON_CONTRACT_PENALTY_INFO pi,
con_contract_cashflow cf
where cr.record_id = pr.record_id
and pr.penalty_reduce_id = pi.penalty_reduce_id
and pr.contract_id = ccc.contract_id
and pi.penalty_reduce_amount > 0
and cr.status = 'APPROVED'
and pi.cashflow_id = cf.cashflow_id
and cf.times > 1))
and ccc.times > 1
and rownum = 1),
'否') cf_9_notfirsttime_exists_flag
,decode(acr_invoice_pkg.check_rl_flag(ct.contract_id), 'N', '否', 'Y', '是') rl_flag_n
FROM con_contract ct FROM con_contract ct
WHERE ct.contract_status NOT IN ('CANCEL') WHERE ct.contract_status NOT IN ('CANCEL')
AND ct.data_class = 'NORMAL' AND ct.data_class = 'NORMAL'
...@@ -753,7 +832,15 @@ ...@@ -753,7 +832,15 @@
<bm:field name="residual_date"/> <bm:field name="residual_date"/>
<bm:field name="terminate_date"/> <bm:field name="terminate_date"/>
<bm:field name="is_buyout_n"/> <bm:field name="is_buyout_n"/>
<bm:field name="bp_class_n"/>
<bm:field name="business_type_n"/>
<bm:field name="division_n"/>
<bm:field name="tenant_change_flag_n"/>
<bm:field name="rental_12_pay_flag"/>
<bm:field name="cf_9_exists_flag"/>
<bm:field name="cf_9_notfirsttime_exists_flag"/>
<bm:field name="secondary_lease_n"/>
<bm:field name="rl_flag_n"/>
</bm:fields> </bm:fields>
<!-- <bm:query-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="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>-->
......
...@@ -39,18 +39,20 @@ ...@@ -39,18 +39,20 @@
t.created_by, t.created_by,
t.creation_date, t.creation_date,
t.last_updated_by, t.last_updated_by,
t.last_update_date t.last_update_date,
t.tax_type_rate
FROM vat_account_tmp t FROM vat_account_tmp t
WHERE t.session_id=${/session/@session_id} WHERE t.session_id=${/session/@session_id}
) t1 ) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
order by invoice_hd_id,due_date ASC,invoice_number asc --order by invoice_hd_id,due_date ASC,invoice_line_id asc
order by invoice_hd_id, invoice_number asc, due_date ASC
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
BEGIN BEGIN
acr_invoice_pkg.vat_account_data_process(p_base_period => ${@base_period}, hl_cm_vat_report_pkg.vat_account_data_process(p_base_period => ${@base_period},
p_session_id => ${/session/@session_id}, p_session_id => ${/session/@session_id},
p_user_id => ${/session/@user_id} ); p_user_id => ${/session/@user_id} );
END; END;
...@@ -58,14 +60,14 @@ ...@@ -58,14 +60,14 @@
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>--> <!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>-->
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/> <bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/> <bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
<!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>--> <!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>-->
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/> <bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/> <bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
<bm:field name="wfl_show_all_approve_ht" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="WFL_SHOW_ALL_APPROVE_HT" prompt="ZJ_WFL_APPROVE_HISTORY_V.WFL_SHOW_ALL_APPROVE_HT"/> <bm:field name="wfl_show_all_approve_ht" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="WFL_SHOW_ALL_APPROVE_HT" prompt="ZJ_WFL_APPROVE_HISTORY_V.WFL_SHOW_ALL_APPROVE_HT"/>
<bm:field name="attach_count" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ATTACH_COUNT" prompt="ATTACH_COUNT"/> <bm:field name="attach_count" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ATTACH_COUNT" prompt="ATTACH_COUNT"/>
<bm:field name="agent_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="AGENT_FLAG" prompt="AGENT_FLAG"/> <bm:field name="agent_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="AGENT_FLAG" prompt="AGENT_FLAG"/>
<bm:field name="instance_status"/>
<bm:field name="role_code"/>
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
...@@ -89,7 +91,10 @@ ...@@ -89,7 +91,10 @@
) attach_count, ) attach_count,
(select u.bp_category (select u.bp_category
from sys_user u from sys_user u
where u.user_id = ${/session/@user_id}) bp_category where u.user_id = ${/session/@user_id}) bp_category,
(select zi.status from zj_wfl_workflow_instance zi
where zi.instance_id = t1.instance_id) instance_status,
(select sr.role_code from sys_role sr where sr.role_id = ${/session/@role_id}) role_code
FROM FROM
zj_wfl_approve_history_v t1 zj_wfl_approve_history_v t1
WHERE WHERE
...@@ -144,7 +149,10 @@ ...@@ -144,7 +149,10 @@
) attach_count, ) attach_count,
(select u.bp_category (select u.bp_category
from sys_user u from sys_user u
where u.user_id = ${/session/@user_id}) bp_category where u.user_id = ${/session/@user_id}) bp_category,
(select zi.status from zj_wfl_workflow_instance zi
where zi.instance_id = t1.instance_id) instance_status,
(select sr.role_code from sys_role sr where sr.role_id = ${/session/@role_id}) role_code
FROM FROM
zj_wfl_approve_history_v t1 zj_wfl_approve_history_v t1
WHERE WHERE
...@@ -184,7 +192,9 @@ ...@@ -184,7 +192,9 @@
NULL AS wfl_show_approve_ht, NULL AS wfl_show_approve_ht,
NULL AS wfl_show_all_approve_ht, NULL AS wfl_show_all_approve_ht,
NULL AS attach_count, NULL AS attach_count,
NULL AS bp_category NULL AS bp_category,
zw.STATUS instance_status,
(select sr.role_code from sys_role sr where sr.role_id = ${/session/@role_id}) role_code
FROM zj_wfl_workflow_instance zw FROM zj_wfl_workflow_instance zw
WHERE zw.instance_id = ${@instance_id} WHERE zw.instance_id = ${@instance_id}
......
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
a1.service_name, a1.service_name,
a1.service_desc, a1.service_desc,
a1.node_action_desc, a1.node_action_desc,
nvl(a1.node_action_prompt,'您确认吗?') as node_action_prompt, --nvl(a1.node_action_prompt,'您确认吗?') as node_action_prompt,
prj_project_workflow_pkg.get_node_action_prompt(a1.node_action_id,${/parameter/@instance_id}) node_action_prompt,
a1.default_action_flag a1.default_action_flag
from zj_wfl_workflow_node_action_v a1 from zj_wfl_workflow_node_action_v a1
where not exists where not exists
......
var override_queryfields = [
];
var add_datafilters=[{
name:'authority_flag',
expression : "exists (select 1 from sys_user su where ((exists (select 1 from exp_employees ee,exp_employee_types et where ee.employee_id = su.employee_id and ee.employee_type_id = et.employee_type_id and et.employee_type_code = 'STAFF')) or t1.owner_user_id = su.user_id) and su.user_id = ${/session/@user_id})"
},
{ name:'contract_status',
expression :" t1.contract_status not in ('NEW','INCEPTING','INCEPT_RETURN') "
}
];
add_datafilter();
override();
//
\ No newline at end of file
var override_queryfields = [
{
name: 'contract_number',
queryexpression: "t1.contract_number = ${@contract_number}"
},
{
name: 'bp_name',
queryexpression: "t1.bp_name = ${@bp_name}"
},
{
name: 'journal_date',
queryexpression: "to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"
},
{
name: 'base_period',
queryexpression: "to_char(t1.journal_date,'yyyymm') < ${@base_period}"
}
];
var add_datafilters = [{
name: 'base_period',
expression: "t1.journal_date <= add_months(last_day(to_date(${@base_period},'yyyymm')),-1) and (t1.invoice_date is null or t1.invoice_date >= TRUNC(to_date(${@base_period},'yyyymm'),'dd'))"
}];
override();
add_datafilter();
\ No newline at end of file
var override_queryfields = [
{
name: 'contract_number',
queryexpression: "t1.contract_number = ${@contract_number}"
},
{
name: 'bp_name',
queryexpression: "t1.bp_name = ${@bp_name}"
},
{
name: 'journal_date',
queryexpression: "to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"
},
{
name: 'base_period',
queryexpression: "to_char(t1.journal_date,'yyyymm') = ${@base_period}"
}
];
var add_datafilters = [{
name: 'base_period',
expression: " to_char(t1.journal_date,'yyyymm') = ${@base_period} and (t1.invoice_date is null or to_char(t1.invoice_date,'yyyymm') < ${@base_period})"
}];
override();
add_datafilter();
\ No newline at end of file
var override_queryfields = [
{
name: 'invoice_kind',
queryexpression: "t1.invoice_kind = ${@invoice_kind}"
},
{
name: 'contract_number',
queryexpression: "t1.contract_number = ${@contract_number}"
},
{
name: 'bp_name',
queryexpression: "t1.bp_name = ${@bp_name}"
},
{
name: 'journal_date',
queryexpression: "to_char(t1.je_date,'yyyy-mm-dd') = ${@journal_date}"
},
{
name: 'invoice_date',
queryexpression: "to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"
},
{
name: 'base_period',
queryexpression: "to_char(t1.je_date,'yyyymm') <= ${@base_period}"
}
];
var add_datafilters = [{
name: 'base_period',
expression: "to_char(t1.invoice_date,'yyyymm') = ${@base_period}"
}];
override();
add_datafilter();
\ No newline at end of file
remove_query_field('CONTRACT_ID');
remove_datafilter('contract_id');
var add_datafilters=[
{
name:'bp_id',
expression:'(t1.bp_id = ${@bp_id})'
}
];
add_datafilter();
\ No newline at end of file
var add_datafilters=[{
name: 'authority_flag',
expression: "((CF_ITEM_N !='会计核销违约金' and exists (SELECT 1 FROM sys_role sr\n" +
"where (sr.role_code ='0018' \n" +
"or sr.role_code = '0019')\n" +
"and sr.role_id=${/session/@role_id})) or ( not exists (SELECT 1 FROM sys_role sr\n" +
"where (sr.role_code ='0018' \n" +
"or sr.role_code = '0019')\n" +
"and sr.role_id=${/session/@role_id})))"
}];
add_datafilter();
<?xml version="1.0" encoding="UTF-8"?>
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app">
<session-descriptor>
<cookie-name>JSESSIONID1</cookie-name>
<persistent-store-type>replicated_if_clustered</persistent-store-type>
</session-descriptor>
<container-descriptor>
<!--<prefer-web-inf-classes>true</prefer-web-inf-classes>-->
<prefer-application-packages>
<package-name>oracle.*</package-name>
</prefer-application-packages>
<show-archived-real-path-enabled>true</show-archived-real-path-enabled>
</container-descriptor>
<virtual-directory-mapping>
<local-path>/u01</local-path>
<url-pattern>/hls_file/*</url-pattern>
</virtual-directory-mapping>
</weblogic-web-app>
\ No newline at end of file
...@@ -143,6 +143,13 @@ ...@@ -143,6 +143,13 @@
}; };
function onUpdate_selectedDs(ds,record,name,value,oldvalue){
if(name == 'billing_amount' && record.get('rl_flag') == 'Y'){
Leaf.showConfirm('提示', '此现金流为日立返还金现金流,请确认是否修改?', null, function() {
//record.set('billing_amount', oldvalue);
}, 400);
}
}
]]></script> ]]></script>
<style><![CDATA[ <style><![CDATA[
.item-radio-option { .item-radio-option {
...@@ -182,6 +189,7 @@ ...@@ -182,6 +189,7 @@
<a:event name="load" handler="onLoad_selectedDs"/> <a:event name="load" handler="onLoad_selectedDs"/>
<a:event name="select" handler="onSelect_selectedDs"/> <a:event name="select" handler="onSelect_selectedDs"/>
<a:event name="unselect" handler="unSelect_selectedDs"/> <a:event name="unselect" handler="unSelect_selectedDs"/>
<a:event name="update" handler="onUpdate_selectedDs"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
......
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
} }
function contractDs_grid_add() { function contractDs_grid_add() {
$('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds').create()); $('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds')
.create());
} }
function invoiceHd_close() { function invoiceHd_close() {
...@@ -239,6 +240,7 @@ ...@@ -239,6 +240,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="billing_status_ds" lookupCode="CON_BILLING_STATUS"/>
<a:dataSet id="acr510_bp_class" lookupCode="HLS211_BP_CLASS"/> <a:dataSet id="acr510_bp_class" lookupCode="HLS211_BP_CLASS"/>
<a:dataSet id="taxpayer_type_ds" lookupCode="HLS211_TAXPAYER_TYPE"/> <a:dataSet id="taxpayer_type_ds" lookupCode="HLS211_TAXPAYER_TYPE"/>
<a:dataSet id="acr510_invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/> <a:dataSet id="acr510_invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/>
...@@ -293,6 +295,8 @@ ...@@ -293,6 +295,8 @@
<a:record code_value="30" code_value_name="高空作业车"/> <a:record code_value="30" code_value_name="高空作业车"/>
<a:record code_value="40" code_value_name="其它"/> <a:record code_value="40" code_value_name="其它"/>
<a:record code_value="50" code_value_name="星邦高空作业车"/> <a:record code_value="50" code_value_name="星邦高空作业车"/>
<a:record code_value="90" code_value_name="租赁二手机"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr510n_invoice_method_ds"> <a:dataSet id="acr510n_invoice_method_ds">
...@@ -438,7 +442,12 @@ ...@@ -438,7 +442,12 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bp_id_agent_level1"/> <a:field name="bp_id_agent_level1"/>
<a:field name="rl_flag"/>
<a:field name="rl_flag_n" displayField="code_value_name" options="overdue_status_ds"
returnField="rl_flag" valueField="code_value"/>
<a:field name="billing_status"/>
<a:field name="billing_status_n" displayField="code_value_name" options="billing_status_ds"
returnField="billing_status" valueField="code_value"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="queryUpdateFunction"/> <a:event name="update" handler="queryUpdateFunction"/>
...@@ -510,6 +519,10 @@ ...@@ -510,6 +519,10 @@
<a:comboBox bindTarget="allConditionDs" name="invoice_method_n" prompt="开票方式"/> <a:comboBox bindTarget="allConditionDs" name="invoice_method_n" prompt="开票方式"/>
<a:comboBox bindTarget="allConditionDs" name="division_n" prompt="租赁物"/> <a:comboBox bindTarget="allConditionDs" name="division_n" prompt="租赁物"/>
<a:comboBox bindTarget="allConditionDs" name="invoice_type_n" prompt="开票类型"/> <a:comboBox bindTarget="allConditionDs" name="invoice_type_n" prompt="开票类型"/>
<a:comboBox bindTarget="allConditionDs" name="rl_flag_n" prompt="是否日立返还金"/>
</a:hBox>
<a:hBox>
<a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/>
</a:hBox> </a:hBox>
<!-- <a:formBody column="4" labelWidth="400"> <!-- <a:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/> <a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
...@@ -577,7 +590,8 @@ ...@@ -577,7 +590,8 @@
<a:column name="invoice_method_n" prompt="开票方式" width="100"/> <a:column name="invoice_method_n" prompt="开票方式" width="100"/>
<a:column name="division_n" prompt="租赁物" width="100"/> <a:column name="division_n" prompt="租赁物" width="100"/>
<a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" /> <a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" />
<a:column name="rl_flag_n" width="100" align="center" prompt="是否日立返还金" />
<a:column name="billing_status_n" width="100" align="center" prompt="开票状态" />
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:tab> </a:tab>
...@@ -589,7 +603,8 @@ ...@@ -589,7 +603,8 @@
<!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>--> <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
<a:column name="contract_number" prompt="合同编号" align="center" width="100"/> <a:column name="contract_number" prompt="合同编号" align="center" width="100"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/> <a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/>
<a:column name="billing_method_desc" prompt="开票规则" width="155"/> <a:column name="billing_method_desc" prompt="开票规则"
width="155"/>
<a:column name="billing_object_name" autoAdjust="false" <a:column name="billing_object_name" autoAdjust="false"
editor="contractDs_grid_editor_lov" prompt="开票对象名称" editor="contractDs_grid_editor_lov" prompt="开票对象名称"
renderer="render_contractDs_grid" showTitle="true" width="200"/> renderer="render_contractDs_grid" showTitle="true" width="200"/>
......
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
<a:datas dataSource="/model/acr515_currency_list"/> <a:datas dataSource="/model/acr515_currency_list"/>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr515_invoiceVatParaDs" autoCreate="true" model="acr.acr_invoice_hd_v"> <a:dataSet id="acr515_invoiceVatParaDs" autoCreate="true" model="acr.ACR515.acr515_invoice_hd_v">
<a:fields> <a:fields>
<a:field name="currency_desc" displayField="currency_name" options="acr515_currencyDs" <a:field name="currency_desc" displayField="currency_name" options="acr515_currencyDs"
returnField="currency" valueField="currency_code"/> returnField="currency" valueField="currency_code"/>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<a:event name="update" handler="onUpdate_acr515_invoiceVatParaDs"/> <a:event name="update" handler="onUpdate_acr515_invoiceVatParaDs"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr515_invoiceVatDs" autoPageSize="true" maxPageSize="10000" model="acr.acr_invoice_hd_v" <a:dataSet id="acr515_invoiceVatDs" autoPageSize="true" maxPageSize="10000" model="acr.ACR515.acr515_invoice_hd_v"
queryDataSet="acr515_invoiceVatParaDs" selectable="true"> queryDataSet="acr515_invoiceVatParaDs" selectable="true">
<a:fields><![CDATA[ <a:fields><![CDATA[
]]></a:fields> ]]></a:fields>
......
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<a:datas> <a:datas>
<!-- <a:record code_value="AGRI_THREE" code_value_name="农行扣款(三方)"/>--> <!-- <a:record code_value="AGRI_THREE" code_value_name="农行扣款(三方)"/>-->
<a:record code_value="CCB_THREE" code_value_name="建行扣款(三方)"/> <a:record code_value="CCB_THREE" code_value_name="建行扣款(三方)"/>
<a:record code_value="CCB_TWO" code_value_name="建行扣款(两方)"/>
<!-- <a:record code_value="AGRI_TWO" code_value_name="农行扣款(两方)"/>--> <!-- <a:record code_value="AGRI_TWO" code_value_name="农行扣款(两方)"/>-->
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
...@@ -192,7 +193,7 @@ ...@@ -192,7 +193,7 @@
</a:field> </a:field>
<a:field name="bp_id_agent" /> <a:field name="bp_id_agent" />
<a:field name="bp_id_tenant"/> <a:field name="bp_id_tenant"/>
<a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov?pay_method=CCB_THREE" lovWidth="470" title="合同"> <a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov?pay_method=${@pay_method}" lovWidth="470" title="合同">
<a:mapping> <a:mapping>
<a:map from="contract_id" to="contract_id"/> <a:map from="contract_id" to="contract_id"/>
<a:map from="contract_number" to="contract_number"/> <a:map from="contract_number" to="contract_number"/>
...@@ -226,8 +227,8 @@ ...@@ -226,8 +227,8 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="currency_name" readOnly="true"/> <a:field name="currency_name" readOnly="true"/>
<a:field name="pay_method_desc" defaultValue="建行扣款(三方)" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/> <a:field name="pay_method_desc" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="pay_method" defaultValue="CCB_THREE"/> <a:field name="pay_method" />
<a:field name="bank_account_name" readOnly="true"/> <a:field name="bank_account_name" readOnly="true"/>
<a:field name="bank_name" readOnly="true"/> <a:field name="bank_name" readOnly="true"/>
<a:field name="currency" readOnly="true"/> <a:field name="currency" readOnly="true"/>
...@@ -245,7 +246,7 @@ ...@@ -245,7 +246,7 @@
selectable="true"> selectable="true">
</a:dataSet> </a:dataSet>
<a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query?pay_method=CCB_THREE"> <a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query?pay_method=${@pay_method}">
<a:fields> <a:fields>
<a:field name="cashflow_id"/> <a:field name="cashflow_id"/>
<a:field name="bp_tenant_name" readOnly="true"/> <a:field name="bp_tenant_name" readOnly="true"/>
......
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
function export_batch() { function export_batch() {
var r = $('hls_ccb_batch_result_ds').getCurrentRecord(); var r = $('hls_ccb_batch_result_ds').getCurrentRecord();
if (r) { if (r) {
if (r.get('pay_method') == 'CCB_THREE') {//建行 if (r.get('pay_method') == 'CCB_THREE'||r.get('pay_method') == 'CCB_TWO') {//建行
$('hls_ccb_batch_merge_result_grid')._export(); $('hls_ccb_batch_merge_result_grid')._export();
} else if (r.get('pay_method') == 'AGRI_TWO' || r.get('pay_method') == 'AGRI_THREE') { } else if (r.get('pay_method') == 'AGRI_TWO' || r.get('pay_method') == 'AGRI_THREE') {
$('hls_abc_batch_merge_result_grid')._export(); $('hls_abc_batch_merge_result_grid')._export();
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
var pay_method = record.get('pay_method'); var pay_method = record.get('pay_method');
var due_date_to = new Date(record.get('due_date')).format('yyyy-mm-dd').toString(); var due_date_to = new Date(record.get('due_date')).format('yyyy-mm-dd').toString();
var bank_type; var bank_type;
if (pay_method == 'CCB_THREE') { if (pay_method == 'CCB_THREE'||pay_method == 'CCB_TWO') {
bank_type = 'CCB'; bank_type = 'CCB';
str = '建行'; str = '建行';
} else if (pay_method == 'AGRI_TWO' || pay_method == 'AGRI_THREE') { } else if (pay_method == 'AGRI_TWO' || pay_method == 'AGRI_THREE') {
...@@ -372,6 +372,7 @@ ...@@ -372,6 +372,7 @@
width="100"/> width="100"/>
<a:column name="total_success_count" align="right" prompt="扣款成功账号数" width="100"/> <a:column name="total_success_count" align="right" prompt="扣款成功账号数" width="100"/>
<a:column name="message" align="right" prompt="错误消息" width="150"/> <a:column name="message" align="right" prompt="错误消息" width="150"/>
<a:column name="pay_method_desc" align="center" prompt="支付方式" width="120"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
<a:grid hidden="true" width="1" height="1" id="hls_ccb_batch_merge_result_grid" <a:grid hidden="true" width="1" height="1" id="hls_ccb_batch_merge_result_grid"
...@@ -390,23 +391,23 @@ ...@@ -390,23 +391,23 @@
<a:column prompt="备注(选填)"/> <a:column prompt="备注(选填)"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
<!-- <a:grid hidden="true" width="1" height="1" id="hls_abc_batch_merge_result_grid"--> <!-- <a:grid hidden="true" width="1" height="1" id="hls_abc_batch_merge_result_grid"-->
<!-- bindTarget="hls_ccb_batch_merge_result_ds">--> <!-- bindTarget="hls_ccb_batch_merge_result_ds">-->
<!-- <a:columns>--> <!-- <a:columns>-->
<!-- <a:column name="abc_sequence_num" prompt="serial-no"/>--> <!-- <a:column name="abc_sequence_num" prompt="serial-no"/>-->
<!-- <a:column name="abc_pay_type" prompt="pay-type"/>--> <!-- <a:column name="abc_pay_type" prompt="pay-type"/>-->
<!-- <a:column name="abc_transaction_type" prompt="transaction-type"/>--> <!-- <a:column name="abc_transaction_type" prompt="transaction-type"/>-->
<!-- <a:column name="csh_bank_account_num" prompt="account-no"/>--> <!-- <a:column name="csh_bank_account_num" prompt="account-no"/>-->
<!-- <a:column name="csh_bank_account_name" prompt="account-name"/>--> <!-- <a:column name="csh_bank_account_name" prompt="account-name"/>-->
<!-- <a:column name="bank_account_num" prompt="payee-account-to"/>--> <!-- <a:column name="bank_account_num" prompt="payee-account-to"/>-->
<!-- <a:column name="bank_account_name" prompt="payee-name"/>--> <!-- <a:column name="bank_account_name" prompt="payee-name"/>-->
<!-- <a:column name="abc_payee_bank" prompt="payee-bank"/>--> <!-- <a:column name="abc_payee_bank" prompt="payee-bank"/>-->
<!-- <a:column name="abc_usage" prompt="usage"/>--> <!-- <a:column name="abc_usage" prompt="usage"/>-->
<!-- <a:column name="abc_fen_code" prompt="fen-code"/>--> <!-- <a:column name="abc_fen_code" prompt="fen-code"/>-->
<!-- <a:column name="abc_curr_flag" prompt="curr-flag"/>--> <!-- <a:column name="abc_curr_flag" prompt="curr-flag"/>-->
<!-- <a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="amount"/>--> <!-- <a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="amount"/>-->
<!-- </a:columns>--> <!-- </a:columns>-->
<!-- </a:grid>--> <!-- </a:grid>-->
</a:screenBody> </a:screenBody>
</a:view> </a:view>
</a:screen> </a:screen>
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
$(ds_id2).setQueryParameter('copy_contract_id',record1.get('copy_contract_id')); $(ds_id2).setQueryParameter('copy_contract_id',record1.get('copy_contract_id'));
$(ds_id2).setQueryParameter('copy_contract_id',record1.get('copy_contract_id')); $(ds_id2).setQueryParameter('copy_contract_id',record1.get('copy_contract_id'));
$(ds_id2).query(); $(ds_id2).query();
debugger
var records2 = $(ds_id2).getAll(); var records2 = $(ds_id2).getAll();
if (records2 && records2.length != 0) { if (records2 && records2.length != 0) {
var param_list = []; var param_list = [];
...@@ -226,9 +225,11 @@ ...@@ -226,9 +225,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) {
if (value != old_value) { if (value != old_value) {
if (update_falg != 'Y') { if (update_falg != 'Y') {
if (name == 'reduce_amount_total') { if (name == 'reduce_amount_total') {
// record.set('reduce_amount_total',value>record.get('unreceived_overdue_amount') ?record.get('unreceived_overdue_amount'):value); // record.set('reduce_amount_total',value>record.get('unreceived_overdue_amount') ?record.get('unreceived_overdue_amount'):value);
...@@ -241,7 +242,6 @@ ...@@ -241,7 +242,6 @@
var ratio = parseFloat(Leaf.formatNumber(div(record.get('reduce_amount_total'), record.get('total_overdue_amount')), 4)); var ratio = parseFloat(Leaf.formatNumber(div(record.get('reduce_amount_total'), record.get('total_overdue_amount')), 4));
// update_falg = 'Y'; // update_falg = 'Y';
record.set('reduce_amount_total_ratio', ratio); record.set('reduce_amount_total_ratio', ratio);
} }
...@@ -251,6 +251,8 @@ ...@@ -251,6 +251,8 @@
record.set('reduce_amount_total', amount); record.set('reduce_amount_total', amount);
}*/ }*/
} else { } else {
update_falg = 'N'; update_falg = 'N';
} }
...@@ -268,9 +270,23 @@ ...@@ -268,9 +270,23 @@
return false; return false;
} }
} }
var penalty_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
var records_penalty = $(penalty_ds_id).getCurrentRecord();
var reduce_amount_total= records_penalty.get('reduce_amount_total');
var gld_received_amount= records_penalty.get('gld_received_amount');
var remaining_amount =minus(records_penalty.get('total_overdue_amount'), reduce_amount_total);
if(remaining_amount<gld_received_amount){
$L.showErrorMessage('提示','营业确认违约金需要大于等于会计确认的违约金!');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
return true; return true;
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}; };
//add by lihh 20210323 //add by lihh 20210323
window['${/parameter/@layout_code}_con500_cdd_attachtment_upload'] = function(id, name, query_only) { window['${/parameter/@layout_code}_con500_cdd_attachtment_upload'] = function(id, name, query_only) {
......
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<a:link id="prj_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="prj_project_modify_link"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_create_tree_n.lview"/>
<a:link id="update_win_query"
url="${/request/@context_path}/modules/cont/CON2000/project_maintain.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script ><![CDATA[
function update_win_query1(record_id, ds_id){
var record = $(ds_id).findById(record_id);
record.set('function_usage','UPDATE');
record.set('maintain_type','UPDATE');
record.set('function_code','CON2000N');
record.set('document_id',record.get('contract_id'));
record.data['url_title'] = '催收短信查询';
var param = record.data;
param['winid'] = 'update_win_query_window';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'update_win_query',ds_id);
}
//超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
if (name == 'contract_number' && value) {
return '<a href="javascript:update_win_query1(\'' + record.id + '\',\'' + record.ds.id + '\');">' + value + '</a>';
}
return value;
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query fetchAll="true" model="cont.CON2000.login_user" rootPath="login_user"/>
</a:init-procedure>
<a:view>
<a:link id="prj_approval_link_id" model="cont.CON2000.contract_phone_approval" modelaction="update"/>
<a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id"
url="${/request/@context_path}/downloadFile.lview"/>
<!-- <a:link id="prj_approval_link_id" model="classes/cont/CON2000/contract_phone_approval.lwm" modelaction="update"/>-->
<script ><![CDATA[
//新增和加载时调用(form)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var user_name = '${/model/login_user/record/@user_name}';
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_1', 'con_contract');
if(user_name!='ZHOUYICONG'&&"${/model/role_info/record/@role_code}" !="0019" ){
if (tenant_ds_id == ds.id) {
record.getField('ht_send_message_n').setReadOnly(true);
record.getField('ht_cell_phone').setReadOnly(true);
}
}else{
if (tenant_ds_id == ds.id) {
if (Leaf.isEmpty(record.get('ht_send_message'))) {
record.set('ht_send_message', 'YES');
record.set('ht_send_message_n', '是');
record.getField('ht_cell_phone').setRequired(true);
} else if (record.get('ht_send_message') == 'YES') {
record.getField('ht_cell_phone').setRequired(true);
}
if (Leaf.isEmpty(record.get('phone_status'))){
record.set('phone_status', 'NEW');
}
if(record.get('phone_status')=='APPROVING'){
record.getField('ht_send_message_n').setReadOnly(true);
record.getField('ht_cell_phone').setReadOnly(true);
}
}
}
}
//只有代理店下级和周一聪才会显示按钮
if("${/model/role_info/record/@role_code}"!="0019" && '${/model/login_user/record/@user_name}'!='ZHOUYICONG'){
if(document.getElementById('${/parameter/@layout_code}_user_button1')){
document.getElementById('${/parameter/@layout_code}_user_button1').style.display = "none";
}
if(document.getElementById('${/parameter/@layout_code}_save')){
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}
if('${/parameter/@phone_status}'=='APPROVING'){
document.getElementById('${/parameter/@layout_code}_user_button1').style.display = "none";
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
var submit_wfl_flag = 'N';
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗?', function () {
submit_wfl_flag = 'Y';
window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK']();
});
}
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var current_record = $(ds_id).getCurrentRecord();
var contract_id = current_record.get('contract_id');
if (submit_wfl_flag == 'Y') {
submit_wfl_flag = 'N';
Leaf.request({
url: $('prj_approval_link_id').getUrl(),
para: {
contract_id: contract_id
},
scope: this,
success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
Aurora.SideBar.show({
msg: '操作成功',
duration: 2000
});
},
failure: function () {
submit_wfl_flag = 'N';
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
submit_wfl_flag = 'N';
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
});
}else{
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
}
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_1', 'con_contract');
if (tenant_ds_id == ds.id && tenant_ds_id) {
if (name == 'ht_send_message') {
if (value == 'YES') {
record.getField('ht_cell_phone').setRequired(true);
} else if (value == 'NO') {
record.getField('ht_cell_phone').setRequired(false);
}
}
}
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
<a:link id="${/parameter/@layout_code}_contract_seal_link_id" url="${/request/@context_path}/modules/cont/CON301N/con_contract_finish_seal_info.lview"/> <a:link id="${/parameter/@layout_code}_contract_seal_link_id" url="${/request/@context_path}/modules/cont/CON301N/con_contract_finish_seal_info.lview"/>
<a:link id="con_contract_finish_print_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/> <a:link id="con_contract_finish_print_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<!-- <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>--> <!-- <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>-->
<a:link id="rl_notice_print_link"
url="${/request/@context_path}/modules/cont/CON301N/rl_notice_print.lsc"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract'); // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract');
...@@ -87,6 +89,12 @@ ...@@ -87,6 +89,12 @@
} }
} }
var role_code = '${/model/role_info/record/@role_code}';
if(role_code!="0008"&&role_code!="0017"&&role_code!="HAND") {
document.getElementById("CONTRACT_QUERY_ENTRANCE_user_button9").style.display = "none";
} else {
document.getElementById("CONTRACT_QUERY_ENTRANCE_user_button9").style.display = "";
}
}); });
function open_contract_win(ds_id, record_id) { function open_contract_win(ds_id, record_id) {
...@@ -269,6 +277,24 @@ ...@@ -269,6 +277,24 @@
//window.location.href='${/request/@context_path}/con/contract/conExportExcel?contractId='+record.get('contract_id'); //window.location.href='${/request/@context_path}/con/contract/conExportExcel?contractId='+record.get('contract_id');
}; };
//返还金通知打印
window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function () {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var cur_record = $(ds_id).getSelected()[0];
var rl_flag = cur_record.get("rl_flag");
if(rl_flag == 'Y'){
var document_id = cur_record.get("contract_id");
var to_file_name = '返还租金通知'+ cur_record.get("contract_number") + '.docx'
var url = $('rl_notice_print_link').getUrl() + '?document_id=' + document_id + '&document_table=CON_RL_NOTICE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON&to_file_name='+to_file_name;
window.open(href = url, target = "_blank");
}else if(rl_flag == 'N'){
Leaf.showMessage('提示', '请选择是日立为优质客户付租金的合同!');
return;
}
};
]]></script> ]]></script>
<a:screen-include <a:screen-include
screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON501"/> screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON501"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<a:model-update model="hls.HLS811.hls_doc_file_templet_get_atm"/>
<s:server-script import="contract_print_path.js"><![CDATA[
importPackage(java.io);
importPackage(Packages.hls.plugin.docx4j);
importPackage(Packages.leaf.plugin.word2pdf);
importPackage(Packages.org.apache.commons.io);
//删除文件
function deleteFile(filePath) {
var file = new File(filePath);
if (file.exists()) {
file.delete();
}
}
//生成pdf
function wordToPdf(word_file_path,pdf_file_path) {
// word转pdf
var pdf_file_path_new = pdf_file_path + '.pdf';
var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
//删除word文件
//deleteFile(word_file_path);
return pdf_file_path_new;
}
function copyFile(fOld, fNew) {
var fis = new java.io.FileInputStream(fOld);
var fos = new java.io.FileOutputStream(fNew);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
var len = -1;
while ((len = fis.read(b)) != -1) {
fos.write(b, 0, len);
}
fis.close();
fos.close();
}
function transfer(file_path, os) {
println(file_path);
var fis = new FileInputStream(file_path);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function write_os_to_file(file, os) {
var fis = new FileInputStream(file);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function download_file(file_name, file_path) {
$ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
resp.setHeader("Pragma", "No-cache");
resp.setHeader("Cache-Control", "no-cache, must-revalidate");
resp.setDateHeader("Expires", 0);
resp.setContentType("application/x-msdownload");
resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'UTF-8'));
var os = resp.getOutputStream();
//transfer(file_path, os);
write_os_to_file(file_path, os);
os.flush();
}
//按日期创建目录
function getDatePath() {
set_parameter_file_path();
var file_path = $ctx.parameter.pdf_path; //file_path = c:/hls_test_files/content_files/
var now = new Date()
y = now.getFullYear()
m = now.getMonth() + 1
m = m < 10 ? "0" + m : m
var datePath = file_path + y + "/" + m + "/";
return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
}
function collection_create_content() {
try {
var datePath = getDatePath();
FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
var attachment_batch_dl = $bm('hls.HLS811.hls_doc_file_templet_get_atm');
var result = attachment_batch_dl.queryAsMap({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table,
batch_flag: $ctx.parameter.batch_flag,
content_id: $ctx.parameter.content_id
});
var from_file_data = result.getChildren();
for (var i = 0;i < from_file_data.length;i++) {
if (!$ctx.parameter.file_path) {
set_parameter_file_path();
}
var to_file_path = $ctx.parameter.file_path;
var record_data = from_file_data[i];
//if (record_data.file_exists_flag != 'Y') {
var to_file_name = record_data.to_file_name;
var from_file_path = record_data.file_path;
var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
var guid_file_name_tables = guid_file_name_path.getChildren();
to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'doc' + record_data.content_id;
copyFile(from_file_path, to_file_path);
try {
$bm('csh.CSH501.csh_transaction_return_print').update({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table
});
var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id.toString(), 'COMMON');
} catch (e) {
raise_app_error(e);
}
// word转pdf
var pdf_file_path=to_file_path;
var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
//var outputfilename= record_data.to_file_name +'.pdf';
var filename_str = record_data.to_file_name;
var outputfilename= filename_str.substr(0, filename_str.length - 5) +'.pdf';
var pdf_file = new File(outputfilepath);
var file_size = 0;
if (pdf_file.exists()) {
file_size = pdf_file.length();
}
$bm('hls.HLS811.hls_file_content_copy_update').update({
table_name: 'HLS_DOC_FILE_CONTENT',
content_id: record_data.content_id,
file_name: outputfilename.toString(),
file_path: outputfilepath.toString(),
source_type: $ctx.parameter.source_type
});
//var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
//HlsFileUtil.downloadFile(encodeURI(to_file_path,'utf-8'),encodeURI(to_file_name,'utf-8'),resp);
//print(outputfilepath.toString());
//print(outputfilename.toString());
download_file(outputfilename.toString(),outputfilepath.toString());
}
$ctx.parameter.return_status = 'S';
$ctx.parameter.return_message = '执行成功';
} catch (e) {
$ctx.success = "true";
$ctx.parameter.return_status = 'E';
$ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
raise_app_error(e);
}
var result = {
result: $ctx.parameter.return_status,
message: $ctx.parameter.return_message
};
$ctx.parameter.json = JSON.stringify(result);
}
if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
collection_create_content();
}
]]></s:server-script>
</a:init-procedure>
<a:service-output/>
</a:service>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" <a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true"
dynamiccreateenabled="true" trace="true"> dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/> <a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/>
<s:server-script import="contract_print_path.js"><![CDATA[ <s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path']; $ctx.parameter.file_path = con_print_path['con_print_path'];
...@@ -124,6 +125,8 @@ ...@@ -124,6 +125,8 @@
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2').style.display = 'none';
} }
if (record.get('business_type') == 'LEASE') { if (record.get('business_type') == 'LEASE') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT').style.display = 'none';
...@@ -142,8 +145,8 @@ ...@@ -142,8 +145,8 @@
} }
} }
//新增 “限制金额”字段; //新增 “限制金额”字段;
//“扣款限额”:“租金支付方式”为“建行扣款(三方)”时展示; //“扣款限额”:“租金支付方式”为“建行扣款”时展示;
if (record.get('pay_method') == 'CCB_THREE') { if (record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'block'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'block'; document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'block';
} else { } else {
...@@ -731,6 +734,22 @@ ...@@ -731,6 +734,22 @@
$(gridId).hideColumn('ownership_flag_n'); $(gridId).hideColumn('ownership_flag_n');
$(gridId).hideColumn('created_by_n'); $(gridId).hideColumn('created_by_n');
} }
if(record.data.division=='30'||record.data.division=='50'||record.data.division=='80'){
record.getField('set_number').setRequired(true);
}else{
record.getField('set_number').setReadOnly(true);
if(Ext.isEmpty(record.get('set_number'))){
record.set('set_number',1);
}
}
}
var cashflow_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CASHFLOW_1', 'con_contract_cashflow');
if(ds.id == cashflow_ds_id&&cashflow_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if("${/model/role_info/record/@role_code}" =="0018" || "${/model/role_info/record/@role_code}" =="0019" ){
$(gridId).hideColumn('gld_received_amount');
}
} }
}; };
......
...@@ -104,6 +104,12 @@ ...@@ -104,6 +104,12 @@
if(record.data.lease_name70=='Y'){ if(record.data.lease_name70=='Y'){
record.data.division=record.data.division+',70'; record.data.division=record.data.division+',70';
}; };
if(record.data.lease_name80=='Y'){
record.data.division=record.data.division+',80';
};
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
record.data.division=record.data.division.substr(1,record.data.division.length); record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query(); $('contract_sales_result_ds').query();
$('contract_sales_agent_result_ds').query(); $('contract_sales_agent_result_ds').query();
...@@ -191,7 +197,10 @@ ...@@ -191,7 +197,10 @@
<a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/> <a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/> <a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/>
<a:checkBox name="lease_name80" bindTarget="contract_sales_report_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" bindTarget="contract_sales_report_ds" prompt="其它"/> <a:checkBox name="lease_name40" bindTarget="contract_sales_report_ds" prompt="其它"/>
</a:form> </a:form>
<a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40"> <a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">
......
...@@ -21,7 +21,68 @@ ...@@ -21,7 +21,68 @@
'con_contract' 'con_contract'
); );
var param={}; var param={};
var period_name=$(ds_id).getAt(0).get('period_name'); var period_name=$(ds_id).getAt(0).get('period_name');
var record = $(ds_id).getAt(0);
record.data.division1='';
record.data.division2='';
record.data.division3='';
record.data.division4='';
record.data.division5='';
record.data.division6='';
record.data.division7='';
record.data.division8='';
record.data.division9='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
if(record.data.lease_name20=='Y'){
record.data.division2='20';
}
if(record.data.lease_name30=='Y'){
record.data.division3='30';
}
if(record.data.lease_name40=='Y'){
record.data.division4='40';
}
if(record.data.lease_name50=='Y'){
record.data.division5='50';
}
if(record.data.lease_name60=='Y'){
record.data.division6='60';
}
if(record.data.lease_name70=='Y'){
record.data.division7='70';
};
if(record.data.lease_name80=='Y'){
record.data.division8='80';
};
if(record.data.lease_name90=='Y'){
record.data.division9='90';
};
// record.data.division=record.data.division.substr(1,record.data.division.length);
if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''){
// record.data.division1='10,20,30,40,50,60,70,80';
record.data.division1='10';
record.data.division2='20';
record.data.division3='30';
record.data.division4='40';
record.data.division5='50';
record.data.division6='60';
record.data.division7='70';
record.data.division8='80';
record.data.division9='90';
};
param['division1']= record.data.division1;
param['division2']= record.data.division2;
param['division3']= record.data.division3;
param['division4']= record.data.division4;
param['division5']= record.data.division5;
param['division6']= record.data.division6;
param['division7']= record.data.division7;
param['division8']= record.data.division8;
param['division9']= record.data.division9;
param['period_name']=period_name; param['period_name']=period_name;
param['function_code'] = 'CON3400N'; param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
......
<?xml version="1.0" encoding="UTF-8"?>
<!--<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">-->
<a:service xmlns:ns1="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<s:server-script ><![CDATA[
importPackage(Packages.java.util);
importPackage(Packages.java.lang);
importPackage(Packages.com.hand.hl);
importPackage(Packages.java.io);
importPackage(java.io);
try{
var sys_url_bm=$bm('cont.CON4000.get_sys_url');
var parameter_code='HLS_SYSTEM_URL';
var SysurlQuery = sys_url_bm.queryAsMap({
parameter_code: parameter_code
});
var sys_url = SysurlQuery.getChildren()[0].parameter_value;
var down_url =sys_url+'modules/cont/CON4000/hlcm_business_daily.lsc';
var now = new Date()
y = now.getFullYear()
m = now.getMonth() + 1
m = m < 10 ? "0" + m : m
d = now.getDate();
var fileDir_bm=$bm('cont.CON4000.get_sys_url');
var parameter_code='HLCM_EMAIL_URL';
var fileDirQuery = fileDir_bm.queryAsMap({
parameter_code: parameter_code
});
var f_fileDir = fileDirQuery.getChildren()[0].parameter_value;
var filePath = (f_fileDir + y + "\\" + m + "\\").toString();
var tranfer_dir= new File(String(filePath));
if(!tranfer_dir.exists()){//如果文件夹不存在,创建文件夹
tranfer_dir.mkdirs();//创建文件夹
}
var f_fileName = ('建机营业日报'+y+m+d+'.xlsx').toString();
var result_flag=DoloadFileByUrl.downloadFile(down_url, filePath, f_fileName);
file_size=get_file_length(filePath+f_fileName);
if(result_flag=true){
var business_daily_email=$bm('cont.CON4000.business_daily_email').update({
p_file_path :(filePath+f_fileName).toString(),
p_file_name :f_fileName,
p_file_size :file_size,
p_user_id :1
});
}
}catch(e){
raise_app_error(e.message);
}
function get_file_length(path){
var file=new File(String(path));
if(file.exists() && file.isFile()){
//println(f.length());
length=file.length();
return length;}
else{
return 0 ;}
}
]]></s:server-script>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
xmlns:dr="leaf.plugin.excelreport" trace="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="cont.CON4000.hlcm_business_daily" rootPath="/model/hlcm_business_daily"/>
<dr:excel-report enableTask="false" filename="营业日报.xlsx">
<dr:styles>
<dr:cell-style name="header" align="ALIGN_CENTER" borderbottom="BORDER_THIN" borderleft="BORDER_THIN"
borderright="BORDER_THIN" bordertop="BORDER_THIN">
<dr:font bold="true" fontname="宋体" height="10" italic="false"/>
</dr:cell-style>
<dr:cell-style name="cell1" align="ALIGN_LEFT" borderbottom="BORDER_THIN" borderleft="BORDER_THIN"
borderright="BORDER_THIN" bordertop="BORDER_THIN">
<dr:font bold="false" fontname="宋体" height="10" italic="false"/>
</dr:cell-style>
<dr:cell-style name="cell2" align="ALIGN_RIGHT" borderbottom="BORDER_THIN" borderleft="BORDER_THIN"
borderright="BORDER_THIN" bordertop="BORDER_THIN">
<dr:font bold="false" fontname="Arial" height="10" italic="false"/>
</dr:cell-style>
</dr:styles>
<dr:sheets>
<dr:sheet name="建机营业日表" autoSizeColumns="0,1,2,3,4,5," displayGridlines="false" dataModel="/model/hlcm_business_daily">
<dr:static-content>
<dr:cell-data cell="C" row="1" stylename="header" type="content" value="新规案件" />
<dr:cell-data cell="D" row="1" stylename="header" type="content" value="新规案件" tablecolmerge="3"/>
<dr:cell-data cell="E" row="1" stylename="header" type="content" value="新规案件" tablecolmerge="3"/>
<dr:cell-data cell="F" row="1" stylename="header" type="content" value="资产余额"/>
<dr:cell-data cell="A" row="2" stylename="header" type="content" value="业务"/>
<dr:cell-data cell="B" row="2" stylename="header" type="content" value="类别"/>
<dr:cell-data cell="C" row="2" stylename="header" type="content" value="今日"/>
<dr:cell-data cell="D" row="2" stylename="header" type="content" value="累计(本月)"/>
<dr:cell-data cell="E" row="2" stylename="header" type="content" value="累计(本财年)"/>
<dr:cell-data cell="F" row="2" stylename="header" type="content" value="今日"/>
<dr:cell-data cell="A" row="3" stylename="header" type="content" value="建机"/>
<dr:cell-data cell="A" row="4" stylename="header" type="content" value="建机"/>
<dr:cell-data cell="B" row="3" stylename="header" type="content" value="台数"/>
<dr:cell-data cell="B" row="4" stylename="header" type="content" value="金额"/>
<dr:cell-data cell="C" row="3" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@day_num}"/>
<dr:cell-data cell="D" row="3" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@month_num}"/>
<dr:cell-data cell="E" row="3" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@year_num}"/>
<dr:cell-data cell="F" row="3" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@all_num}"/>
<dr:cell-data cell="C" row="4" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@day_money}"/>
<dr:cell-data cell="D" row="4" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@month_money}"/>
<dr:cell-data cell="E" row="4" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@year_money}"/>
<dr:cell-data cell="F" row="4" stylename="header" type="content" value="${/model/hlcm_business_daily/record/@all_money}"/>
</dr:static-content>
</dr:sheet>
</dr:sheets>
</dr:excel-report>
</a:init-procedure>
</a:service>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
if(record.data.lease_name70=='Y'){ if(record.data.lease_name70=='Y'){
record.data.division=record.data.division+',70'; record.data.division=record.data.division+',70';
}; };
if(record.data.lease_name80=='Y'){
record.data.division=record.data.division+',80';
};
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
record.data.division=record.data.division.substr(1,record.data.division.length); record.data.division=record.data.division.substr(1,record.data.division.length);
Leaf.Masker.mask(Ext.getBody(), '正在统计并查询,请稍等...'); Leaf.Masker.mask(Ext.getBody(), '正在统计并查询,请稍等...');
Leaf.request({ Leaf.request({
...@@ -115,6 +121,8 @@ ...@@ -115,6 +121,8 @@
<a:field checkedValue="Y" name="lease_name50" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name50" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name60" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name60" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
<a:field name="division" /> <a:field name="division" />
<a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/> <a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/>
<a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/> <a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/>
...@@ -158,13 +166,14 @@ ...@@ -158,13 +166,14 @@
<a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/> <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>
<a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/> <a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
<!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>--> <!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>-->
<!-- <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
if ('${/model/pilot_run_user/record/@pilot_run_flag}' == 'N'){ if ('${/model/pilot_run_user/record/@pilot_run_flag}' == 'N'){
$('${/parameter/@layout_code}_user_button4').hide(); $('${/parameter/@layout_code}_user_button4').hide();
} }
}
}); });
var calc_flag = 'N'; var calc_flag = 'N';
//新增和加载时调用form //新增和加载时调用form
......
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
if (type == 'agree'&&con_business_type == 'LEASE') { if (type == 'agree'&&con_business_type == 'LEASE') {
var records = $(lnds_id).getAll(); var records = $(lnds_id).getAll();
for (var i = 0; i < records.length; i++) { for (var i = 0; i < records.length; i++) {
if (records[i].get('billing_status_n') != '开票' || records[i].get('invoice_status_n') != '已确认') { if (records[i].get('billing_status_n') != '全部开票' || records[i].get('invoice_status_n') != '已确认') {
$L.showErrorMessage("提示", '请选择开票状态为开票,发票状态为已确认的现金流!'); $L.showErrorMessage("提示", '请选择开票状态为全部开票,发票状态为已确认的现金流!');
return false; return false;
} }
} }
......
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
return; return;
} }
//暂时去掉 //暂时去掉
// if(a[i].get('billing_status_n')!='开票' ||a[i].get('invoice_status_n')!='已确认'){ // if(a[i].get('billing_status_n')!='全部开票' ||a[i].get('invoice_status_n')!='已确认'){
// $L.showErrorMessage("提示",'请选择开票状态为开票,发票状态为已确认的现金流!'); // $L.showErrorMessage("提示",'请选择开票状态为全部开票,发票状态为已确认的现金流!');
// return; // return;
// } // }
if (a[i].get('business_type') == 'LEASEBACK') { if (a[i].get('business_type') == 'LEASEBACK') {
......
...@@ -125,6 +125,20 @@ ...@@ -125,6 +125,20 @@
win.on('close', function() {}); win.on('close', function() {});
}; };
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var return_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
if (return_ds == ds.id) {
if (name == 'return_bp_type' && value == 'OTHER') {
record.getField('return_bp_code').setRequired(true);
record.getField('bp_bank_account_name').setReadOnly(false);
}else if(name == 'return_bp_type' && value != 'OTHER'){
record.getField('return_bp_code').setRequired(false);
record.getField('bp_bank_account_name').setReadOnly(true);
}
}
};
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view> </a:view>
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
$Purpose: $Purpose:
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application"> <a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure/> <a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure>
<a:view> <a:view>
<div/> <div/>
<a:link id="csh_transaction_return_detail_link" <a:link id="csh_transaction_return_detail_link"
...@@ -36,10 +38,15 @@ ...@@ -36,10 +38,15 @@
$L.showWarningMessage("提示",'只能选择一条退款记录进行打印!'); $L.showWarningMessage("提示",'只能选择一条退款记录进行打印!');
return; return;
} }
var cur_record = records[0];
if(Ext.isEmpty(cur_record.get('sbo_num'))||Ext.isEmpty(cur_record.get('receipt_sbo_num'))){
$L.showWarningMessage("提示",'SBO凭证号未生成,无法打印!');
return;
}
var templet_code = 'CSH_RETURN_INFO'; var templet_code = 'CSH_RETURN_INFO';
// var document_id = record.get('ast_car_insurance_records_id'); // var document_id = record.get('ast_car_insurance_records_id');
var url_l = $('assignment_agreement_print_link').getUrl() + '?document_id=' + records[0].get("return_id") + '&document_table=CSH_TRANSACTION_RETURN&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON'; var url_l = $('assignment_agreement_print_link').getUrl() + '?document_id=' + records[0].get("return_id") + '&document_table=CSH_TRANSACTION_RETURN&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
window.open(href = url_l, target = "_self"); window.open(href = url_l, target = "_blank");
} }
function openWindow1(url) { function openWindow1(url) {
new Leaf.Window({ new Leaf.Window({
...@@ -83,7 +90,7 @@ ...@@ -83,7 +90,7 @@
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
<a:gridButton id="csh515_returned_list_back_id" click="csh515_returned_list_back" text="HLS.EXIT"/> <a:gridButton id="csh515_returned_list_back_id" click="csh515_returned_list_back" text="HLS.EXIT"/>
<a:gridButton id="csh515_returned_apply_print" click="csh_transaction_print" text="退款申请书打印"/> <a:gridButton id="csh515_returned_apply_print" click="csh_transaction_print" text="退款申请书打印" />
</a:screenTopToolbar> </a:screenTopToolbar>
<a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true"> <a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true">
<a:columns> <a:columns>
...@@ -104,5 +111,16 @@ ...@@ -104,5 +111,16 @@
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
<script>
Leaf.onReady(function () {
// 债权内勤(0009), 宏菱管理员(0017),宏菱管理员(HAND) 才展示打印按钮
var role_code = '${/model/role_info/record/@role_code}';
if (!(role_code == '0009' || role_code =='0017' || role_code =='HAND')) {
if (document.getElementById('csh515_returned_apply_print')) {
document.getElementById('csh515_returned_apply_print').style.display = "none";
}
}
})
</script>
</a:view> </a:view>
</a:screen> </a:screen>
\ No newline at end of file
...@@ -98,10 +98,23 @@ ...@@ -98,10 +98,23 @@
} }
}; };
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record) {
//0017 宏菱管理员 HAND HAND管理员
var role_code = '${/model/user_name_path/record/@role_code}';
if (record) {
if (role_code == '0017' || role_code == 'HAND') {
record.getField('ref_n01').setReadOnly(false);
} else {
record.getField('ref_n01').setReadOnly(true);
}
}
};
//新增时调用(grid,table,gridBox) //新增时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) { 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_name}'); record.set("created_by_n",'${/model/user_name_path/record/@user_name}');
record.set("created_by",'${/session/@user_id}'); record.set("created_by",'${/session/@user_id}');
record.getField('ref_n01').setReadOnly(false);
}; };
//更新机型信息 //更新机型信息
......
...@@ -829,6 +829,39 @@ ...@@ -829,6 +829,39 @@
} }
} }
} }
var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
if (role_ds == ds.id) {
var bp_type_flag='N';
var records = $(ds.id).getAll();
if(name=='bp_type'){
for (var i = 0;i < records.length;i++) {
if(records[i].get('bp_type')=='TENANT'){
bp_type_flag='Y';
}
}
if(bp_type_flag=='Y'){
for (var i = 0;i < records.length;i++) {
if(records[i].get('bp_type')=='TENANT'){
records[i].set('primary_flag','Y')
}else{
records[i].set('primary_flag','N')
}
}
}
}
var primary_flag = record.get('primary_flag');
if (primary_flag == 'Y') {
var bm_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var bm_record = $(bm_ds_id).getCurrentRecord();
bm_record.set('bp_type', record.get('bp_type'));
bm_record.set('bp_type_n', record.get('bp_type_n'));
bm_record.set('bp_category', record.get('bp_category'));
bm_record.set('bp_category_n', record.get('bp_category_n'));
}
}
}; };
function upload_file(id, name, query_only) { function upload_file(id, name, query_only) {
......
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var bp_info_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_journal_header'); var bp_info_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_journal_header');
if( Ext.isEmpty(record.get('journal_header_id'))){
record.set('je_company_id', 1); record.set('je_company_id', 1);
record.set('je_company_id_n', '宏菱租赁'); record.set('je_company_id_n', '宏菱租赁');
record.set('currency_code', 'CNY'); record.set('currency_code', 'CNY');
...@@ -149,6 +150,7 @@ ...@@ -149,6 +150,7 @@
record.set('reversed_flag', 'N'); record.set('reversed_flag', 'N');
record.set('source_table', 'hls_journal_header'); record.set('source_table', 'hls_journal_header');
record.set('company_id', 1); record.set('company_id', 1);
}
}; };
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
This diff is collapsed.
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