Commit 44b8131c authored by stone's avatar stone

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into feature/credit_feature

parents 18be16ea 6a9c2afa
...@@ -20,6 +20,7 @@ overlays/ ...@@ -20,6 +20,7 @@ overlays/
# sql # sql
*~sql *~sql
*~pck
# common config rename # common config rename
uncertain.local.xml uncertain.local.xml
......
...@@ -8,3 +8,14 @@ INSERT INTO SYS_FUNCTION_DYNAMIC ...@@ -8,3 +8,14 @@ INSERT INTO SYS_FUNCTION_DYNAMIC
LAST_UPDATED_BY) LAST_UPDATED_BY)
VALUES VALUES
('CON_REPO001D', '合同回购申请明细', 1, SYSDATE, -1, SYSDATE, -1); ('CON_REPO001D', '合同回购申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file
create or replace package cus_con_contract_repo_pkg is create or replace package cus_con_contract_repo_pkg is
-- Author : Spencer 3893 -- Author : Spencer 3893
-- Created : 9/10/2019 2:21:13 PM -- Created : 9/10/2019 2:21:13 PM
...@@ -149,12 +149,7 @@ create or replace package body cus_con_contract_repo_pkg is ...@@ -149,12 +149,7 @@ create or replace package body cus_con_contract_repo_pkg is
v_contract_rec con_contract%rowtype; v_contract_rec con_contract%rowtype;
begin begin
v_contract_rec := get_contract_rec(p_contract_id, p_user_id);
select *
into v_contract_rec
from con_contract cc
where cc.contract_id = p_contract_id
for update nowait;
if v_contract_rec.contract_status <> 'INCEPT' and p_req_type = 'REPUR' then if v_contract_rec.contract_status <> 'INCEPT' and p_req_type = 'REPUR' then
sys_raise_app_error_pkg.raise_sys_others_error(p_message => '只有起租状态的合同才能进行回购申请!', sys_raise_app_error_pkg.raise_sys_others_error(p_message => '只有起租状态的合同才能进行回购申请!',
...@@ -601,16 +596,16 @@ create or replace package body cus_con_contract_repo_pkg is ...@@ -601,16 +596,16 @@ create or replace package body cus_con_contract_repo_pkg is
select f.due_date, f.outstanding_rental_tax_incld select f.due_date, f.outstanding_rental_tax_incld
into v_last_rent_due_date, v_sum_unreceived_principal into v_last_rent_due_date, v_sum_unreceived_principal
from con_contract_cashflow f from con_contract_cashflow f
where f.times = (select max(f.times)
from con_contract_cashflow f
where f.due_date < p_repurchase_date where f.due_date < p_repurchase_date
and f.cf_item = 1 and f.cf_item = 1
and f.cf_type = 1 and f.cf_type = 1
and f.contract_id = p_contract_id and f.contract_id = p_contract_id)
and f.times = (select max(f.times) and f.due_date <= p_repurchase_date
from con_contract_cashflow f
where f.due_date < p_repurchase_date
and f.cf_item = 1 and f.cf_item = 1
and f.cf_type = 1 and f.cf_type = 1
and f.contract_id = p_contract_id); and f.contract_id = p_contract_id;
p_last_rent_due_date := v_last_rent_due_date; p_last_rent_due_date := v_last_rent_due_date;
--已回收租金 --已回收租金
select sum(nvl(F.RECEIVED_AMOUNT, 0)) select sum(nvl(F.RECEIVED_AMOUNT, 0))
...@@ -657,7 +652,7 @@ create or replace package body cus_con_contract_repo_pkg is ...@@ -657,7 +652,7 @@ create or replace package body cus_con_contract_repo_pkg is
'之后数据发起回购!', '之后数据发起回购!',
p_created_by => p_user_id, p_created_by => p_user_id,
p_package_name => 'cus_con_contract_repo_pkg', p_package_name => 'cus_con_contract_repo_pkg',
p_procedure_function_name => 'get_last_rent_due_date'); p_procedure_function_name => 'calc_repo_date_amount');
raise_application_error(sys_raise_app_error_pkg.c_error_number, raise_application_error(sys_raise_app_error_pkg.c_error_number,
sys_raise_app_error_pkg.g_err_line_id); sys_raise_app_error_pkg.g_err_line_id);
......
This diff is collapsed.
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_ET001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/cont/CON_ET001/con_early_termination_query.lview','提前结清创建入口',1,1,0);
sys_function_assign_pkg.service_load('modules/cont/CON_ET001/con_early_termination_et_detail.lview','提前结清申请明细',1,1,0);
--功能定义
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_ET001','提前结清创建','提前结清创建','100','','','modules/cont/CON_ET001/con_early_termination_query.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_ET001','提前结清创建','提前结清创建','100','','','modules/cont/CON_ET001/con_early_termination_query.lview','US',-1);
--分配页面
sys_function_assign_pkg.func_service_load('CON_ET001','modules/cont/CON_ET001/con_early_termination_query.lview');
sys_function_assign_pkg.func_service_load('CON_ET001','modules/cont/CON500/con_contract_authority_list_validate.lview');
sys_function_assign_pkg.func_service_load('CON_ET001','modules/cont/CON500/con_contract_get_layout_code.lview');
sys_function_assign_pkg.func_service_load('CON_ET001','modules/cont/CON_ET001/con_early_termination_et_detail.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON500.con_contract_get_layout_code');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.create_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.submit_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.con_early_termination_query');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON731.cancel_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.calc_et_date_amount');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.calc_cashflow');
sys_function_assign_pkg.func_bm_load('CON_ET001','cont.CON_ET001.submit_change_req');
--分配菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET001',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_ET001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/cont/CON_ET003/con_early_termination_modify_query.lview','提前结清查询',1,1,0);
--功能定义
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_ET003','提前结清查询','提前结清查询','100','','','modules/cont/CON_ET003/con_early_termination_modify_query.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_ET003','提前结清查询','提前结清查询','100','','','modules/cont/CON_ET003/con_early_termination_modify_query.lview','US',-1);
--分配页面
sys_function_assign_pkg.func_service_load('CON_ET003','modules/cont/CON_ET003/con_early_termination_modify_query.lview');
sys_function_assign_pkg.func_service_load('CON_ET003','modules/cont/CON500/con_contract_authority_list_validate.lview');
sys_function_assign_pkg.func_service_load('CON_ET003','modules/cont/CON500/con_contract_get_layout_code.lview');
sys_function_assign_pkg.func_service_load('CON_ET003','modules/cont/CON_ET001/con_early_termination_et_detail.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON500.con_contract_get_layout_code');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.submit_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET003.con_early_termination_modify_query');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON731.cancel_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_et_date_amount');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_cashflow');
sys_function_assign_pkg.func_bm_load('CON_ET003','basic.hls_division_for_lov');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.submit_change_req');
--分配菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET003',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
alter table CON_CONTRACT_CHANGE_REQ add REPO_CHANGE_FLAG varchar2(1); alter table CON_CONTRACT_CHANGE_REQ add REPO_CHANGE_FLAG varchar2(1);
comment on column CON_CONTRACT_CHANGE_REQ.REPO_CHANGE_FLAG comment on column CON_CONTRACT_CHANGE_REQ.REPO_CHANGE_FLAG
is '是否回购'; is '是否回购';
alter table CON_CONTRACT_CHANGE_REQ add FUND_POSSESSION_TIME number;
comment on column CON_CONTRACT_CHANGE_REQ.FUND_POSSESSION_TIME
is '资金占用天数';
alter table CON_CONTRACT_CHANGE_REQ add FUND_POSSESSION_COST number;
comment on column CON_CONTRACT_CHANGE_REQ.FUND_POSSESSION_COST
is '资金占用费';
alter table CON_CONTRACT_CHANGE_REQ add FUND_POSSESSION_RATE number;
comment on column CON_CONTRACT_CHANGE_REQ.FUND_POSSESSION_RATE
is '资金占用费利率';
alter table CON_CONTRACT_CHANGE_REQ add ET_DUE_AMOUNT number;
comment on column CON_CONTRACT_CHANGE_REQ.ET_DUE_AMOUNT
is '提前结清租金';
alter table CON_CONTRACT_CHANGE_REQ add SUM_UNRECEIVED_PRINCIPAL number;
comment on column CON_CONTRACT_CHANGE_REQ.SUM_UNRECEIVED_PRINCIPAL
is '剩余本金';
alter table CON_CONTRACT_CHANGE_REQ add ET_INTEREST_RATE number;
comment on column CON_CONTRACT_CHANGE_REQ.ET_INTEREST_RATE
is '提前结清利率';
CREATE OR REPLACE VIEW CON_CONTRACT_REPO_MODIFY_LV AS CREATE OR REPLACE VIEW CON_CONTRACT_REPO_MODIFY_LV AS
SELECT t1.contract_id, SELECT t1.contract_id,
t1.data_class, t1.data_class,
t1.calc_session_id, t1.calc_session_id,
...@@ -54,6 +54,7 @@ SELECT t1.contract_id, ...@@ -54,6 +54,7 @@ SELECT t1.contract_id,
cr.repo_change_flag cr.repo_change_flag
FROM con_contract t1, FROM con_contract t1,
con_contract_change_req cr con_contract_change_req cr
WHERE t1.contract_id = cr.contract_id WHERE t1.contract_id = cr.change_req_id
AND t1.data_class = 'CHANGE_REQ'
AND cr.repo_change_flag = 'Y' AND cr.repo_change_flag = 'Y'
; ;
CREATE OR REPLACE VIEW CON_CONTRACT_CHANGE_REQ_LV AS
select t.change_req_id,
t.batch_id,
t.change_quotation,
t.change_lease_item,
t.change_bp,
t.change_req_number,
t.document_type,
(select t1.description
from hls_document_type t1
where t1.document_type = t.document_type) as document_type_n,
t.document_category,
t.business_type,
t.company_id,
t.contract_id,
t.req_status,
(select t1.code_value_name
from sys_code_values_v t1
where t1.code = 'CON_CHANGE_REQ_STATUS'
and t1.code_value = t.req_status) as req_status_n,
t.req_date,
t.description,
t.wfl_instance_id,
t.calc_session_id,
t.owner_user_id,
t.submit_date,
t.approved_date,
t.created_by,
(SELECT su.user_name FROM sys_user su WHERE su.user_id=t.created_by)created_by_n,
t.creation_date,
t.last_updated_by,
t.last_update_date,
t.ccr_price_list,
t.ccr_calc_session_id,
t.simulation_flag,
decode(t.simulation_flag,'Y','Y','') as simulation_flag_n,
reschedule_flag,
decode(t.reschedule_flag,'Y','Y','') as reschedule_flag_n,
t.et_flag,
decode(t.et_flag,'Y','Y','') as et_flag_n,
t.tenant_change_flag,
decode(t.tenant_change_flag,'Y','Y','') as tenant_change_flag_n,
t.bank_acc_change_flag,
decode(t.bank_acc_change_flag,'Y','Y','') as bank_acc_change_flag_n,
t.lease_item_change_flag,
decode(t.lease_item_change_flag,'Y','Y','') as lease_item_change_flag_n,
t.mortgage_change_flag,
decode(t.mortgage_change_flag,'Y','Y','') as mortgage_change_flag_n,
t.guarantor_change_flag,
decode(t.guarantor_change_flag,'Y','Y','') as guarantor_change_flag_n,
t.contract_cancel_flag,
decode(t.contract_cancel_flag,'Y','Y','') as contract_cancel_flag_n,
t.cashflow_change_flag,
decode(t.cashflow_change_flag,'Y','Y','') as cashflow_change_flag_n,
cc.contract_number,
cc.contract_name,
cc.bp_id_tenant,
(select m.bp_name from hls_bp_master m where m.bp_id=cc.bp_id_tenant) as bp_id_tenant_n,
cc.inception_of_lease,
nvl(t.et_ins_derate_amount,0) et_ins_derate_amount,
(select sum(cf.principal) - sum(nvl(cf.received_principal, 0))
from con_contract_cashflow cf
where cf.contract_id = t.change_req_id
and cf.cf_item = 1
and cf.cf_direction = 'INFLOW') outstanding_principal,
nvl(t.et_fee,500) et_fee,
nvl(t.et_total_amount,0) et_total_amount,
nvl(t.et_interest,0) et_interest,
--提前结清 start
nvl(t.FUND_POSSESSION_TIME,0)FUND_POSSESSION_TIME,--资金占用天数
NVL(t.FUND_POSSESSION_COST,0)FUND_POSSESSION_COST,--资金占用费
NVL(t.FUND_POSSESSION_RATE,0)FUND_POSSESSION_RATE,--资金占用费利率
NVL(t.ET_DUE_AMOUNT,0)ET_DUE_AMOUNT,--提前结清租金
NVL(t.SUM_UNRECEIVED_PRINCIPAL,0)SUM_UNRECEIVED_PRINCIPAL,--剩余本金
NVL(t.ET_INTEREST_RATE,cc.int_rate_display)ET_INTEREST_RATE,--提前结清利率
cc.bp_id_agent_level1,
(SELECT m.bp_name
FROM hls_bp_master m
WHERE m.bp_id = cc.bp_id_agent_level1)
AS bp_id_agent_level1_n,
nvl(t.residual_value,cc.residual_value)residual_value,
t.ccr_reason
--提前结清 end
from con_contract_change_req t,
con_contract cc
where t.contract_id = cc.contract_id
;
...@@ -51,11 +51,30 @@ ...@@ -51,11 +51,30 @@
<bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_way_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_frequency_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String"/>
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select t.cashflow_id, select t.cashflow_id,
t.bp_name,--承租人姓名
con.billing_method,--开票规则
con.billing_way_n,--开票方式
con.billing_frequency_n,--开票频率
aic.billing_object_name,--开票对象
t.invoice_title,--发票抬头
aic.object_taxpayer_type,--纳税人类型
t.invoice_bp_address_phone_num,--开票地址电话
t.invoice_bp_bank_account,--开户行及账号
t.record_id, t.record_id,
t.billing_object, t.billing_object,
(select c.code_value_name (select c.code_value_name
...@@ -141,10 +160,12 @@ ...@@ -141,10 +160,12 @@
t.invoice_bp_tax_registry_num t.invoice_bp_tax_registry_num
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,
acr_invoice_contract_v aic
where t.session_id = ${/session/@session_id} where t.session_id = ${/session/@session_id}
and t.contract_id = con.contract_id and t.contract_id = con.contract_id
and t.cashflow_id = cf.cashflow_id and t.cashflow_id = cf.cashflow_id
and con.contract_id = aic.contract_id
order by con.contract_id,cf.times,t.cf_item order by con.contract_id,cf.times,t.cf_item
]]> ]]>
</bm:query-sql> </bm:query-sql>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
and cc.bp_id_agent_level1 = h.bp_id), and cc.bp_id_agent_level1 = h.bp_id),
t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM, t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM,
nvl(t2.bill_object_bp_class,t1.BILL_OBJECT_BP_CLASS) BILL_OBJECT_BP_CLASS, nvl(t2.bill_object_bp_class,t1.BILL_OBJECT_BP_CLASS) BILL_OBJECT_BP_CLASS,
nvl(t2.bill_object_bp_class_DESC,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC, nvl(t2.bill_object_bp_class_desc,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC,
t1.TAX_TYPE_VAT, t1.TAX_TYPE_VAT,
t1.DESCRIPTION, t1.DESCRIPTION,
--t1.INVOICE_TITLE, --t1.INVOICE_TITLE,
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
t1.inv_billing_object_name, t1.inv_billing_object_name,
t1.small_scale_taxpayer t1.small_scale_taxpayer
FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2 FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2
#WHERE_CLAUSE# WHERE t2.due_date<sysdate
ORDER BY ORDER BY
t1.contract_id, t1.contract_id,
t2.times, t2.times,
...@@ -341,7 +341,6 @@ ...@@ -341,7 +341,6 @@
<bm:query-field name="bill_flag" <bm:query-field name="bill_flag"
queryExpression="(${@bill_flag} = 'Y' and t1.billing_frequency in (${@times_bill_flag},${@mid_bill_flag},${@final_bill_flag},${@et_bill_flag}) )"/> queryExpression="(${@bill_flag} = 'Y' and t1.billing_frequency in (${@times_bill_flag},${@mid_bill_flag},${@final_bill_flag},${@et_bill_flag}) )"/>
<bm:query-field name="all_contract_number" <bm:query-field name="all_contract_number"
queryExpression="(t1.contract_number in (Select regexp_substr( replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) From dual Connect By regexp_substr(replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) Is Not Null) )"/> queryExpression="(t1.contract_number in (Select regexp_substr( replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) From dual Connect By regexp_substr(replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) Is Not Null) )"/>
<bm:query-field name="notreceived_amount_from" <bm:query-field name="notreceived_amount_from"
...@@ -359,6 +358,7 @@ ...@@ -359,6 +358,7 @@
queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/> queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/>
<bm:query-field name="contract_status" <bm:query-field name="contract_status"
queryExpression="t1.contract_status = ${@contract_status}"/> queryExpression="t1.contract_status = ${@contract_status}"/>
<!-- <bm:query-field name="" queryExpression="t2.due_date &lt;= sysdate"/>-->
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
...@@ -366,10 +366,10 @@ ...@@ -366,10 +366,10 @@
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/> <bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/> expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/>
<!-- <bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="t2.contract_id = t1.contract_id AND t1.billing_status IN (&apos;NOT&apos;, &apos;PARTIAL&apos;) AND t1.contract_status not in (&apos;NEW&apos;,&apos;CANCEL&apos;) AND t2.cf_status = &apos;RELEASE&apos;"/> expression="t2.contract_id = t1.contract_id AND t1.billing_status IN (&apos;NOT&apos;, &apos;PARTIAL&apos;) AND t1.contract_status not in (&apos;NEW&apos;,&apos;CANCEL&apos;) AND t2.cf_status = &apos;RELEASE&apos;"/>
<bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>--> <bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/> expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
cus_con_et_pkg.calc_et_cashflows(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">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="et_fee" dataType="java.lang.Double" input="true" output="true" outputPath="@et_fee"/>
<bm:parameter name="et_total_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@et_total_amount"/>
<bm:parameter name="et_due_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@et_due_amount"/>
<bm:parameter name="overdue_amount" dataType="java.lang.Double" input="false" output="true" outputPath="@overdue_amount"/>
<bm:parameter name="penalty" dataType="java.lang.Double" input="false" output="true" outputPath="@penalty"/>
<bm:parameter name="fund_possession_time" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_time"/>
<bm:parameter name="fund_possession_cost" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_cost"/>
<bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
cus_con_et_pkg.calc_et_date_amount(p_contract_id => ${@contract_id},
p_et_date => TO_DATE(${@termination_date},'yyyy-mm-dd'),
p_ET_FEE => ${@et_fee},
p_et_interest_rate => ${@et_interest_rate},
p_et_total_amount => ${@et_total_amount},
p_et_due_amount => ${@et_due_amount},
p_overdue_amount => ${@overdue_amount},
p_penalty => ${@penalty},
p_fund_possession_time => ${@fund_possession_time},
p_fund_possession_cost => ${@fund_possession_cost},
p_sum_unreceived_principal => ${@sum_unreceived_principal},
p_user_id => ${/session/@user_id});
END;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" input="false" output="true" outputPath="@change_req_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
cus_con_et_pkg.create_change_req_et(p_contract_id=>${@contract_id},
p_req_type=>${@req_type},
p_user_id=>${/session/@user_id},
p_simulation_flag=>${@simulation_flag},
p_change_req_id=>${@change_req_id} );
END;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" input="true" output="false"/>
<bm:parameter name="user_id" dataType="java.lang.Long" input="true" output="false"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
cus_con_et_pkg.submit_change_req_et(p_change_req_id=>${@change_req_id},
p_layout_code=>${@layout_code},
p_user_id=>${/session/@user_id});
end;]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -69,36 +69,36 @@ ...@@ -69,36 +69,36 @@
} }
function onLoad_cashflowDs(ds) { // function onLoad_cashflowDs(ds) {
var hd_ds = $('contractDs'), // var hd_ds = $('contractDs'),
r = hd_ds.getCurrentRecord(); // r = hd_ds.getCurrentRecord();
if (hd_ds.getSelected().indexOf(r) != -1) { // if (hd_ds.getSelected().indexOf(r) != -1) {
ds.selectAll.defer(5, ds); // ds.selectAll.defer(5, ds);
} // }
} // }
var isSelectFromLine = false; var isSelectFromLine = false;
function onSelect_contractDs(ds, record) { // function onSelect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
if (!isSelectFromLine) { // if (!isSelectFromLine) {
$('cashflowDs').selectAll(); // $('cashflowDs').selectAll();
} // }
//
} // }
function unselect_contractDs(ds, record) { // function unselect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
$('cashflowDs').unSelectAll(); // $('cashflowDs').unSelectAll();
} // }
function onSelect_invoiceLineDs(ds, record) { // function onSelect_invoiceLineDs(ds, record) {
record.dirty = true; // record.dirty = true;
isSelectFromLine = true; // isSelectFromLine = true;
$('contractDs').select($('contractDs').getCurrentRecord()); // $('contractDs').select($('contractDs').getCurrentRecord());
isSelectFromLine = false; // isSelectFromLine = false;
} // }
function unSelect_invoiceLineDs(ds, record) { // function unSelect_invoiceLineDs(ds, record) {
record.dirty = false; // record.dirty = false;
} // }
function render_contractDs_grid(value, record, name) { function render_contractDs_grid(value, record, name) {
if (name == 'billing_object_name') { if (name == 'billing_object_name') {
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="contractDs" autoQuery="true" fetchAll="true" model="acr.ACR510.acr_invoice_contract_v" <a:dataSet id="contractDs" autoQuery="false" fetchAll="false" model="acr.ACR510.acr_invoice_contract_v"
queryDataSet="conditionDs" queryDataSet="conditionDs"
queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}" queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}"
selectable="true"> selectable="true">
...@@ -129,21 +129,21 @@ ...@@ -129,21 +129,21 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="select" handler="onSelect_contractDs"/> <!-- <a:event name="select" handler="onSelect_contractDs"/>-->
<a:event name="unselect" handler="unselect_contractDs"/> <!-- <a:event name="unselect" handler="unselect_contractDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
<a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true" <a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true"
model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true"> model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true">
<a:fields> <a:fields>
<a:field name="last_received_date" datatype="date"/> <a:field name="last_received_date" datatype="date"/>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="load" handler="onLoad_cashflowDs"/> <!-- <a:event name="load" handler="onLoad_cashflowDs"/>-->
<a:event name="select" handler="onSelect_invoiceLineDs"/> <!-- <a:event name="select" handler="onSelect_invoiceLineDs"/>-->
<a:event name="unselect" handler="unSelect_invoiceLineDs"/> <!-- <a:event name="unselect" handler="unSelect_invoiceLineDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: Spencer 3893
$Date: 2019-9-19
$Revision: 1.0
$Purpose: 提前结清维护入口
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="basic.hls_division_for_lov" rootPath="hls_division_path"/>
</a:init-procedure>
<a:view>
<a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="con_et_change_link" url="${/request/@context_path}/modules/cont/CON_ET001/con_early_termination_et_detail.lview"/>
<a:link id="con_et_create_change_link" model="cont.CON_ET001.create_change_req" modelaction="execute"/>
<script type="text/javascript"><![CDATA[
function contractQueryScreen_query() {
$('contractQueryScreen_mainDs').query();
}
function contractQueryScreen_reset() {
$('contractQueryScreen_paraDs').reset();
}
function open_change_req(value,record,name){debugger
if(name=='change_req_number'){
var req_status = record.get('req_status');
var change_req_id = record.get('change_req_id');
var contract_id=record.get('contract_id');
if('NEW' == req_status || 'REJECT' == req_status){
return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
}else{
return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
}
}
return value;
}
function open_change_req_detail(change_req_id,contract_id) {debugger
var param = {};
param['change_req_id'] = change_req_id;
param['contract_id'] = change_req_id;
param['source_contract_id'] = contract_id;
//param['layout_debugger_flag'] = 'Y';
param['function_code'] = 'CON_ET002';
param['url_title'] = '提前结清维护';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['document_type'] = 'ET';
param['winid'] = 'con_et003_detail_winid';
hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
}
function open_change_req_readonly_detail(change_req_id,contract_id) {
var param = {};
param['change_req_id'] = change_req_id;
param['contract_id'] = change_req_id;
param['source_contract_id'] = contract_id;
//param['layout_debugger_flag'] = 'Y';
param['function_code'] = 'CON_ET002';
param['url_title'] = '提前结清明细';
param['function_usage'] = 'READONLY';
param['maintain_type'] = 'QUERY';
param['document_type'] = 'ET';
param['winid'] = 'con_et003_detail_winid';
hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON_ET001"/>
<a:dataSets>
<a:dataSet id="yes_or_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
<a:dataSet id="contract_chage_req_status_ds" lookupCode="CON_CHANGE_REQ_STATUS"/>
<a:dataSet id="hls_division_ds">
<a:datas dataSource="/model/hls_division_path"/>
</a:dataSet>
<a:dataSet id="contractQueryScreen_paraDs">
<a:fields>
<a:field name="contract_number" typeCase="upper"/>
<a:field name="contract_name"/>
<a:field name="date_from"/>
<a:field name="date_to"/>
<a:field name="bp_id_tenant"/>
<a:field name="bp_name" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=TENANT" lovWidth="700" title="承租人">
<a:mapping>
<a:map from="bp_id" to="bp_id_tenant"/>
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<!--代理商-->
<a:field name="bp_id_agent_level1"/>
<a:field name="bp_agent" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=AGENT" lovWidth="700" title="代理商">
<a:mapping>
<a:map from="bp_id" to="bp_id_agent_level1"/>
<a:map from="bp_name" to="bp_agent"/>
</a:mapping>
</a:field>
<!--产品线-->
<a:field name="division_n" displayField="description" options="hls_division_ds" returnField="division" valueField="division"/>
<a:field name="contract_status"/>
<a:field name="contract_status_desc" displayField="code_value_name" options="contract_status_ds" returnField="contract_status" valueField="code_value"/>
<a:field name="req_employee_n"/>
<a:field name="req_status"/>
<a:field name="req_status_n" displayField="code_value_name" options="contract_chage_req_status_ds" returnField="contract_status" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="contractQueryScreen_mainDs" autoQuery="true" fetchAll="false" model="cont.CON_ET003.con_early_termination_modify_query" pageSize="14" queryDataSet="contractQueryScreen_paraDs" selectable="true" selectionModel="single">
<a:fields>
<a:field name="et_type_dis" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="cont.CON701.hls_document_type_for_et_lov" lovWidth="500" prompt="提前结清类型" readOnly="true" required="true">
<a:mapping>
<a:map from="document_type" to="et_type"/>
<a:map from="document_type_desc" to="et_type_dis"/>
</a:mapping>
</a:field>
<a:field name="termination_date" datatype="date" required="true"/>
<a:field name="overdue_status" checkedValue="Y" uncheckedValue="N"/>
<a:field name="trial" checkedValue="Y" uncheckedValue="N"/>
<a:field name="lease_execution_date" datatype="date"/>
</a:fields>
<a:events>
<a:event name="query" handler="aut_authority_list_validate_query"/>
</a:events>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
</a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="合同变更编号"/>
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="产品线"/>
<a:textField name="req_employee_n" bindTarget="contractQueryScreen_paraDs" prompt="申请人"/>
<a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
</a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
<a:columns>
<a:column name="change_req_number" prompt="合同变更编号" width="120" align="left" renderer="open_change_req"/>
<a:column name="contract_number" prompt="合同编号" width="120" align="left"/>
<a:column name="contract_name" prompt="合同名称" width="120" align="left"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
<a:column name="division_n" prompt="产品线" width="120" align="left"/>
<a:column name="req_employee_n" prompt="申请人" width="80" align="right"/>
<a:column name="req_status_n" prompt="变更审批状态" width="100" align="center"/>
</a:columns>
</a:grid>
</a:screenBody>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
...@@ -19,8 +19,13 @@ ...@@ -19,8 +19,13 @@
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/> url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
<a:link id="hls213_sap_eai_create_vender_link" <a:link id="hls213_sap_eai_create_vender_link"
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/> url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
<<<<<<< HEAD
<!-- <a:link id="Identity_ccx_link" <!-- <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>--> url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
=======
<!-- <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
>>>>>>> fc911afa6f82f272999782f0b1703081ee8d4607
<script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/>
<a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/> <a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -85,41 +90,42 @@ ...@@ -85,41 +90,42 @@
var bp_record = $(bp_ds_id).getCurrentRecord(); var bp_record = $(bp_ds_id).getCurrentRecord();
var bp_id = bp_record.get('bp_id'); var bp_id = bp_record.get('bp_id');
Leaf.request({ // Leaf.request({
url: $('hls213_sap_eai_create_customer_link').getUrl(), // url: $('hls213_sap_eai_create_customer_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
Leaf.request({ // Leaf.request({
url: $('hls213_sap_eai_create_vender_link').getUrl(), // url: $('hls213_sap_eai_create_vender_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
$(bp_ds_id).setQueryParameter('bp_id', bp_id); // $(bp_ds_id).setQueryParameter('bp_id', bp_id);
$(bp_ds_id).query(); // $(bp_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
sync: true // sync: true
}); // });
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
}; };
...@@ -157,6 +163,81 @@ ...@@ -157,6 +163,81 @@
//由于中诚信测试环境只能测试张三,所以这里限定身份证号为张三的123456199001011233 //由于中诚信测试环境只能测试张三,所以这里限定身份证号为张三的123456199001011233
// if(value=='123456199001011233'){ // if(value=='123456199001011233'){
// //
<<<<<<< HEAD
// var url1 = $('identity_query_link').getUrl();
// window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
/* Leaf.request({
url: url1,
para: {
id_card_no: value,//身份证号码
bp_name: bp_name
},
success: function (res) {
var resmsg_1 = res.result.resmsg_1;
if (resmsg_1 == '1') {
if (name == 'id_card_no') {
record.set('ccx_resmsg', '身份验证成功');
card_identity_flag = 'Y';
} else {
record.set('ccx_resmsg1', '身份验证成功');
sp_identity_flag = 'Y';
}
} else {
//个人身份验证
var url = $('Identity_ccx_link').getUrl();
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: url,
para: {
bp_name: bp_name,//姓名
id_card_no: value//身份证号码
},
success: function (res) {
var resmsg = res.result.resmsg;
if (name == 'id_card_no') {
record.set('ccx_resmsg', resmsg);
if (resmsg == '身份验证成功') {
card_identity_flag = 'Y';
}
} else {
record.set('ccx_resmsg1', resmsg);
if (resmsg == '身份验证成功') {
sp_identity_flag = 'Y';
}
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000
});
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this,
sync: true
});
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this,
sync: true
});*/
=======
// var url1 = $('identity_query_link').getUrl(); // var url1 = $('identity_query_link').getUrl();
// window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
/* Leaf.request({ /* Leaf.request({
...@@ -230,6 +311,7 @@ ...@@ -230,6 +311,7 @@
scope: this, scope: this,
sync: true sync: true
});*/ });*/
>>>>>>> fc911afa6f82f272999782f0b1703081ee8d4607
} }
if (value.length == 18) { if (value.length == 18) {
...@@ -275,12 +357,13 @@ ...@@ -275,12 +357,13 @@
//保存前调用,生成商机编号 //保存前调用,生成商机编号
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
// //
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var head_record = $(ds_id).getCurrentRecord(); var head_record = $(ds_id).getCurrentRecord();
var bp_class = head_record.get('bp_class'); var bp_class = head_record.get('bp_class');
//alert('${/parameter/@unbrand}'); //alert('${/parameter/@unbrand}');
if (bp_class == 'NP') { if (bp_class == 'NP') {
if (card_identity_flag == 'Y' || sp_identity_flag == 'Y') { if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = false; var check_flag = false;
if (head_record.get('bp_code')) { if (head_record.get('bp_code')) {
......
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:init-procedure/>
<a:view>
<!-- <a:link id="BmLink_MainScreen_functionHit" model="sys.sys_page_function_visit" modelaction="update"/>-->
<script><![CDATA[
//退出按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
$('hls_bp_master_billing').close();
}
Leaf.onReady(function () {
var billing_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
// console.log($(billing_ds));
$(billing_ds).setQueryParameter("bp_id","${/parameter/@bp_id}");
$(billing_ds).query();
}
)
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
\ No newline at end of file
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<a:link id="hls214N_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="hls214N_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="${/parameter/@layout_code}_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="${/parameter/@layout_code}_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="hls214_bp_master_save_link_id" model="hls.HLS214.hls_bp_change_agent" modelaction="update"/> <a:link id="hls214_bp_master_save_link_id" model="hls.HLS214.hls_bp_change_agent" modelaction="update"/>
<a:link id="hls214_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/> <!-- <a:link id="hls214_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>-->
<a:link id="hls214_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/> <!-- <a:link id="hls214_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>-->
<script src="${/request/@context_path}/javascripts/identity_card_info_query.js" <script src="${/request/@context_path}/javascripts/identity_card_info_query.js"
type="text/javascript"></script> type="text/javascript"></script>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -33,41 +33,41 @@ ...@@ -33,41 +33,41 @@
var bp_record = $(bp_ds_id).getCurrentRecord(); var bp_record = $(bp_ds_id).getCurrentRecord();
var bp_id = bp_record.get('bp_id'); var bp_id = bp_record.get('bp_id');
Leaf.request({ // Leaf.request({
url: $('hls214_sap_eai_create_customer_link').getUrl(), // url: $('hls214_sap_eai_create_customer_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
Leaf.request({ // Leaf.request({
url: $('hls214_sap_eai_create_vender_link').getUrl(), // url: $('hls214_sap_eai_create_vender_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
$(bp_ds_id).query(); // $(bp_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
// },
// failure: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
}; };
function prj_check_bp_id(record) { function prj_check_bp_id(record) {
......
...@@ -23,10 +23,43 @@ ...@@ -23,10 +23,43 @@
url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_report.lview"/> url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_report.lview"/>
<a:link id="hls_bp_ccx_icinfo_link" <a:link id="hls_bp_ccx_icinfo_link"
url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_icinfo.lview"/> url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_icinfo.lview"/>
<a:link id="hls_bp_master_billing_link"
url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_billing.lview"/>
<script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
//信息变更
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
var data=$(ds_id).selected[0];
var invoice_bp_bank_account = data.get('invoice_bp_bank_account');
var invoice_title = data.get('invoice_title');
var invoice_bp_address_phone_num = data.get('invoice_bp_address_phone_num');
var phone =data.get('phone');
var taxpayer_type =data.get('taxpayer_type');
var invoice_bp_bank =data.get('invoice_bp_bank');
var bp_id=data.get('bp_id');
new Leaf.Window({
id: 'hls_bp_master_billing',
url: $('hls_bp_master_billing_link').getUrl(),
params: {
function_code:'HLS214NS',
invoice_bp_bank_account:invoice_bp_bank_account,
invoice_title:invoice_title,
invoice_bp_address_phone_num:invoice_bp_address_phone_num,
phone:phone,
taxpayer_type:taxpayer_type,
invoice_bp_bank:invoice_bp_bank,
bp_id:bp_id
},
title: '开票信息',
fullScreen: true
});
}
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
function open_bp_modify_win(ds_id, record_id) { function open_bp_modify_win(ds_id, record_id) {
...@@ -34,7 +67,7 @@ ...@@ -34,7 +67,7 @@
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var param = record.data; var param = record.data;
param['function_code'] = 'HLS214D'; param['function_code'] = 'HLS214D';
debugger; // debugger;
if (record.get('bp_category') == 'AGENT') { if (record.get('bp_category') == 'AGENT') {
param['function_code'] = 'HLS228DL'; param['function_code'] = 'HLS228DL';
} }
......
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