Skip to content

L
leaf-hlcm
Commit ca50c851 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'develop' 

# Conflicts:
#	src/main/webapp/modules/cont/CON505/con_contract_modify.lview
parents d113e828 c8ab0da5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1857 additions and 618 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @ ca50c851
......@@ -91,7 +91,7 @@
(select i.description
from hls_cashflow_item i
where i.cf_item = t.cf_item) as cf_item_desc,
'融资租赁费' as product_name,
decode(t.cf_item,250,'设备款','融资租赁费') as product_name,
con.contract_status contract_status,
cf.cf_status cf_status,
t.invoice_kind_type,
......
src/main/webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm
View file @ ca50c851
......@@ -28,7 +28,7 @@
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="code" expression="t1.code =decode(${@lease_channel},&apos;00&apos;,&apos;CON500_CONTRACT_STATUS&apos;,&apos;01&apos;,&apos;CON660_CONTRACT_STATUS&apos;,&apos;CON500_CONTRACT_STATUS&apos;)"/>
<bm:data-filter name="code_value" enforceOperations="query" expression="t1.code_value in(&apos;NEW&apos;,&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;CLOSED&apos;)"/>
<bm:data-filter name="code_value" enforceOperations="query" expression="t1.code_value in(&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;TERMINATE&apos;,&apos;TERMINATING&apos;,&apos;ET&apos;,&apos;REPUR&apos;)"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/acr/ACR516/acr_bpname_for_bpmster.lwm
View file @ ca50c851
......@@ -3,11 +3,12 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select hb.bp_name from hls_bp_master hb where hb.bp_id = ${@bp_id}
select hb.bp_name,hb.bp_code from hls_bp_master hb where hb.bp_id = ${@bp_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_NAME"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CODE"/>
</bm:fields>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm
View file @ ca50c851
......@@ -57,6 +57,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and ctr.paid_byother_flag='T'),0,'F','T') paid_byother_flag,
(Select v.code_value_name
From sys_code_values_v v
......@@ -67,6 +68,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and ctr.paid_byother_flag='T'),0,'F','T')) paid_byother_flag_n,
(case when al.cf_item<>'9' then cwo.received_amount else
al.total_amount end)received_amount,
......@@ -77,6 +79,7 @@
Where ctr.transaction_id = cw.csh_transaction_id
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and nvl(ctr.guarantor_name_duty,'N')='Y'),0,'N','Y') guarantor_name_duty,
(Select to_char(max(cw.write_off_date),'yyyy-mm-dd')
From csh_transaction ctr,csh_write_off cw
......@@ -95,6 +98,7 @@
And alw.cashflow_id = cco.cashflow_id
and cw.reversed_flag='N'
and ctr.paid_byother_flag='T'
and cw.cf_item<>2
and nvl(ctr.guarantor_name_duty,'N')='N')paid_byother_sum_flag,
null attachment
From acr_invoice_apply aa,
......
src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_query.lwm
View file @ ca50c851
......@@ -100,6 +100,7 @@
begin
acr_invoice_wfl_pkg.update_reverse_method(p_invoice_apply_id => ${@invoice_apply_id},
p_reverse_method => ${@reverse_method},
p_note => ${@note},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/check_after_save_bm/check_bp_master_billing_after_save.lwm
View file @ ca50c851
......@@ -22,6 +22,13 @@
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id}
);
hls_bp_master_change_req_pkg.update_hls_bp_master_status(
p_change_req_id => ${@change_req_id},
p_bp_id => r_hls_bp_master_req.bp_id,
p_status => 'APPROVED',
p_req_type => r_hls_bp_master_req.req_type,
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/check_after_save_bm/con_check_deduction_limit_after_save.lwm 0 → 100644
View file @ ca50c851
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2015-12-02 下午1:29:07
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
cus_con_change_req_pkg.check_con_dedution_limit(
p_change_req_id =>${@change_req_id},
p_user_id =>${/session/@user_id},
p_pay_method =>${@pay_method},
p_bank_branch_num =>${@bank_branch_num},
p_contract_number =>${@contract_number},
p_deduction_limit =>${@deduction_limit},
p_layout_code =>${@layout_code},
p_err_msg =>${@err_msg});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@err_msg"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/check_after_save_bm/prj_project_create_check.lwm
View file @ ca50c851
......@@ -20,7 +20,9 @@
p_save_source_type =>${@save_source_type},
p_project_status =>${@project_status},
p_bp_id_tenant =>${@bp_id_tenant},
p_cdd_list_id => ${@cdd_list_id});
p_cdd_list_id => ${@cdd_list_id},
p_editable_flag =>${@editable_flag},
p_credit_line =>${@credit_line});
END;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/cont/CON500/con_doc_file_para_table_column.lwm
View file @ ca50c851
......@@ -15,7 +15,11 @@
pa.column_num,
pa.column_width,
pa.alignment,
pa.column_desc,
--pa.column_desc,
hls_doc_file_templet_pkg.get_cus_bookmark_column_desc(cc.content_id,
p.bookmark,
pa.column_name,
pa.column_desc) column_desc,
NVL(p.table_width,0) table_width,
NVL(p.ind_width,0) ind_width,
NVL(p.font_family,'宋体') font_family,
......
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ ca50c851
......@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;)))"/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;)))"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ ca50c851
......@@ -58,20 +58,18 @@ select t.parent_company_id company_id
<bm:query-field field="dd_bank_account_name" queryOperator="="/>
<!--<bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
<bm:query-field name="bp_id" queryExpression="(Exists (Select 1 From (Select h.bp_id From hls_bp_master h Where h.bp_name = (Select hbm.bp_name From hls_bp_master hbm Where hbm.bp_id = ${@bp_id})) t1 Where t1.bp_id = t.bp_id_tenant) Or Exists
<bm:query-field name="bp_id" queryExpression="(Exists (Select 1
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
and h.bp_id = t.bp_id_tenant) Or not Exists
(Select 1
From (Select h.bp_id
From hls_bp_master h
Where h.bp_name =
(Select hbm.bp_name
From hls_bp_master hbm
Where hbm.bp_id = ${@bp_id})) t2
Where t2.bp_id = t.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}
And t.contract_id = ccli.contract_id))"/>
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
))"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_plan_query.lwm
View file @ ca50c851
......@@ -16,7 +16,7 @@
<bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="核销金额"/>
<bm:field name="write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="WRITE_OFF_DATE" prompt="CSH_TRANSACTION_PLAN.WRITE_OFF_DATE"/>
<bm:field name="company_id" databaseType="NUMBER" databasetype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH_TRANSACTION_PLAN.COMPANY_ID"/>
<bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))"/>
<bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))" forInsert="false" forceUpdate="false"/>
<bm:field name="create_wf_flag"/>
</bm:fields>
<bm:query-fields>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm
View file @ ca50c851
......@@ -109,6 +109,7 @@
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/>
<bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED'))"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
</bm:data-filters>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
View file @ ca50c851
......@@ -70,7 +70,8 @@
<bm:field name="rate_method_code" expression="(select t.rate_method_code from gld_exchangerate_types t where t.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false"/>
<bm:field name="zero_amounts_allowed" expression="(select d.zero_amounts_allowed from csh_bank_account_v d where d.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false"/>
<bm:field name="transaction_type_desc" forInsert="false" forUpdate="false" prompt="HLS.TRANSACTION_TYPE"/>
<bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
<!-- <bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>-->
<bm:field name="unwrite_off_amount" expression="(t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
<bm:field name="precision" expression="(select g.precision from gld_currency g where g.currency_code =t1.currency_code)" forInsert="false" forUpdate="false"/>
<bm:field name="reverse_amount" expression="(-1*t1.transaction_amount)" forInsert="false" forUpdate="false" prompt="CSH511.REVERSE_AMOUNT"/>
<bm:field name="user_desc" expression="(select su.description from sys_user su where su.user_id=t1.created_by)" forInsert="false" forUpdate="false"/>
......@@ -132,7 +133,7 @@
or (decode(${/session/@user_id}, 10600, 1, 2) = 2) )"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0) )or(${@query_amount_flag}='2' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) =0) )or (${@query_amount_flag}='3' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >=0)))"/>
<bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))>0) )or(${@query_amount_flag}='2' and ( (t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))=0) )or (${@query_amount_flag}='3' and ( (t1.transaction_amount-nvl((select sum(cw.write_off_due_amount) from csh_write_off cw where cw.csh_transaction_id=t1.transaction_id and cw.reversed_flag='N' and cw.write_off_date &lt;=nvl(to_date(${@write_off_date_to},&apos;yyyy-mm-dd&apos;),sysdate) ),0))>=0)))"/>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/>
......
src/main/webapp/WEB-INF/classes/hls/HLS361N/hls_bp_master_create_record.lwm
View file @ ca50c851
......@@ -37,7 +37,8 @@
rd.enable_flag,
to_char(rd.last_update_date,'yyyy-mm-dd')last_update_date,
(select description from sys_user s where s.user_id= rd.created_by)last_updated_by_desc,
(select description from sys_user s where s.user_id= rd.temp_user)temp_user_desc
(select description from sys_user s where s.user_id= rd.temp_user)temp_user_desc,
(select v.unit_name from exp_emp_assign_e_v v where v.unit_id = hbm.unit_id and rownum = 1) agent_name
from HLS_BP_MASTER_CREDIT_HD hd,
hls_bp_master hbm,
......
src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_abc_2_output_temp_for_maintain.lwm
View file @ ca50c851
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP" defaultOrderBy="t1.ebank_tmp_id">
<bm:fields>
<bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
<bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>
......
src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm
View file @ ca50c851
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP" defaultOrderBy="t1.ebank_tmp_id">
<bm:fields>
<bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
<bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500D/prj_project_get_description.lwm 0 → 100644
View file @ ca50c851
<?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 r1.employee_type_code
FROM EXP_EMPLOYEES t1, EXP_EMPLOYEE_TYPES_VL r1
WHERE t1.EMPLOYEE_TYPE_ID = r1.EMPLOYEE_TYPE_ID
AND t1.employee_id =
(SELECT su.employee_id FROM sys_user su WHERE su.user_id = ${/session/@user_id})
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_after_query.lwm 0 → 100644
View file @ ca50c851
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lihh
$Date: 2021-06-10 上午10:30:21
$Revision: 1.0
$Purpose: 逾期租金表（保证金后）获取数据
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select
rct.agent_extra_name agent_extra_name_af,
rct.bp_tenant_name bp_tenant_name_af,
rct.branch_code branch_code_af,
rct.contract_id contract_id_af,
rct.contract_number contract_number_af,
rct.cshflow_id cshflow_id_af,
nvl(rct.deposit_amount,0) deposit_amount_af,
rct.due_amount due_amount_af,
to_char(rct.due_date,'yyyy-mm-dd') due_date_af,
(NVL(rct.int_rate_display, 0) * 100 ||'%') int_rate_display_af,
rct.is_buyout,
(Select v1.code_value_name
From sys_code_values_v v1
Where v1.code = 'YES_OR_NO'
And v1.code_enabled_flag = 'Y'
And v1.code_value_enabled_flag = 'Y'
and v1.CODE_VALUE = rct.is_buyout) is_buyout_af,
rct.large_balance large_balance_af,
rct.machine_number machine_number_af,
to_char(rct.lease_start_date,'yyyy-mm-dd') lease_start_date_af,
rct.modelcd modelcd_af,
nvl(rct.overdue_days,0) overdue_days_af,
nvl(rct.received_amount,0) received_amount_af,
rct.times times_af,
nvl(rct.unreceived_amount,0) unreceived_amount_af,
rct.rent_type
from
rpt5012_csh_result_after_temp rct
order by rct.contract_number,rct.times
]]></bm:query-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_result_query_pkg.get_result_received_amount(
p_month =>${@month},
p_cur_begin =>${@cur_begin},
p_cur_end =>${@cur_end},
p_before_begin =>${@before_begin},
p_before_end =>${@before_end}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="cur_begin" dataType="date" input="true" output="true"
outputPath="/parameter/@cur_begin"/>
<bm:parameter name="cur_end" dataType="date" input="true" output="true"
outputPath="/parameter/@cur_end"/>
<bm:parameter name="before_begin" dataType="date" input="true" output="true"
outputPath="/parameter/@before_begin"/>
<bm:parameter name="before_end" dataType="date" input="true" output="true"
outputPath="/parameter/@before_end"/>
</bm:parameters>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="agent_extra_name_af"/>
<bm:field name="bp_tenant_name_af"/>
<bm:field name="contract_number_af"/>
<bm:field name="lease_start_date_af"/>
<bm:field name="modelcd_af"/>
<bm:field name="machine_number_af"/>
<bm:field name="int_rate_display_af"/>
<bm:field name="times_af"/>
<bm:field name="due_date_af"/>
<bm:field name="due_amount_af" datatype="java.lang.Double"/>
<bm:field name="received_amount_af" datatype="java.lang.Double"/>
<bm:field name="unreceived_amount_af" datatype="java.lang.Double"/>
<bm:field name="overdue_days_af" datatype="java.lang.Double"/>
<bm:field name="deposit_amount_af" datatype="java.lang.Double"/>
<bm:field name="is_buyout_af"/>
<bm:field name="rent_type"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_query.lwm
View file @ ca50c851
......@@ -26,7 +26,12 @@
'yyyy-mm-dd') lease_start_date,
ccli.machine_number,
ccli.modelcd,
ccc.times,
(CASE
WHEN ccc.cf_item = 8 THEN
'留购价'
ELSE
to_char(ccc.times)
END) times,
to_char(ccc.due_date, 'yyyy-mm-dd') due_date,
(NVL(t.int_rate_display, 0) * 100 ||
......@@ -95,7 +100,13 @@
Where v.code = 'BRANCH_CODE_SZMP'
And v.code_enabled_flag = 'Y'
And v.code_value_enabled_flag = 'Y'
And v.code_value = t.branch_code) branch_code_n
And v.code_value = t.branch_code) branch_code_n,
(CASE
WHEN to_char(ccc.due_date,'MM') = to_char(to_date(${@cur_begin}, 'yyyy-mm-dd'),'MM') THEN
'新增租金'
ELSE
'往期租金'
END) rent_type
from con_contract_cashflow ccc, con_contract t, con_contract_lease_item ccli
WHERE ccc.contract_id = t.contract_id
AND ccli.contract_id (+) = t.contract_id
......@@ -118,7 +129,7 @@
AND trunc(t.transaction_date) <
trunc(to_date(${@cur_begin}, 'yyyy-mm-dd'))),
0)
order by t.contract_id
order by t.contract_id,ccc.times,decode(ccc.cf_item,1,1,200,2,8,3,4)
) v
]]></bm:query-sql>
</bm:operation>
......@@ -144,12 +155,13 @@
<bm:field name="int_rate_display"/>
<bm:field name="times"/>
<bm:field name="due_date"/>
<bm:field name="due_amount"/>
<bm:field name="received_amount"/>
<bm:field name="unreceived_amount"/>
<bm:field name="overdue_days"/>
<bm:field name="deposit_amount"/>
<bm:field name="due_amount" datatype="java.lang.Double"/>
<bm:field name="received_amount" datatype="java.lang.Double"/>
<bm:field name="unreceived_amount" datatype="java.lang.Double"/>
<bm:field name="overdue_days" datatype="java.lang.Double"/>
<bm:field name="deposit_amount" datatype="java.lang.Double"/>
<bm:field name="is_buyout_n"/>
<bm:field name="rent_type"/>
</bm:fields>
<!-- <bm:query-fields>-->
<!-- <bm:query-field field="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>-->
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zi_wfl_approve_get_submitted.lwm 0 → 100644
View file @ ca50c851
<?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 h.bp_name, h.bp_code, h.bp_id
FROM exp_emp_assign_e_v ee, hls_bp_master h
WHERE ee.user_id = (SELECT zw.submitted_by
FROM zj_wfl_workflow_instance zw
WHERE zw.instance_id = ${/parameter/@instance_id})
AND ee.unit_id = h.unit_id
AND h.bp_category = 'AGENT'
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
\ No newline at end of file
src/main/webapp/modules/acr/ACR514/acr_invoice_reverse_apply_temp_detail.lview
View file @ ca50c851
......@@ -41,7 +41,8 @@
url: $('acr620_invoice_reverse_save_link').getUrl(),
para: {
invoice_apply_id: invoice_apply_id,
reverse_method: record.get('reverse_method')
reverse_method: record.get('reverse_method'),
note: record.get('note')
},
success: function () {
Leaf.SideBar.show({
......@@ -167,6 +168,7 @@
datas['invoice_hd_ids'] = invoice_hd_ids;
datas['apply_mode'] = 'REVERSE';
datas['details'] = saveData;
datas['note'] = head_record.get('note');
if (head_ds.validate()) {
if (head_record.get('reverse_method') == 'REVERSE') {
var all_record = $('acr514_invoice_reverse_detail_result_ds').getAll();
......@@ -278,6 +280,7 @@
<a:field name="reverse_method_n" displayField="code_value_name" options="acr514_reverse_method_ds"
returnField="reverse_method" valueField="code_value" required="true"
requiredMessage="请输入必输字段：反冲方式"/>
<a:field name="note" required="true" requiredMessage="请输入必输字段：反冲意见"/>
</a:fields>
</a:dataSet>
<a:dataSet id="acr514_invoice_reverse_detail_result_ds" autoPageSize="true" autoQuery="true" fetchAll="true"
......@@ -310,6 +313,9 @@
<a:comboBox name="reverse_method_n" bindTarget="acr514_invoice_reverse_apply_basic_ds" prompt="反冲方式"
width="135"/>
</a:hBox>
<a:hBox row="2" labelSeparator=" ">
<a:textArea name="note" bindTarget="acr514_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565"/>
</a:hBox>
</a:form>
<a:grid id="acr514_invoice_reverse_detail_grid_ds" bindTarget="acr514_invoice_reverse_detail_result_ds"
marginHeight="130"
......
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ ca50c851
......@@ -117,6 +117,7 @@
msg: '发送成功',
duration: 2000
});
$('acr516_invoice_result_ds').query();
}
});
},null);
......
src/main/webapp/modules/acr/ACR516/import_invoice_to_email.lsc
View file @ ca50c851
......@@ -37,8 +37,8 @@
bp_id: str
});
var bp_att = bp_map.getChildren();
var bp_name = bp_att[0].bp_name;
return bp_name;
//var bp_name = bp_att[0].bp_name;
return bp_att[0];
}
try {
var resultStr = $ctx.parameter.result_map;
......@@ -51,8 +51,9 @@
var fileN = [];
//转为数字
var bp_id = parseInt(key);
var bp_name = getBpName(bp_id);
//println(key);
var bp_name = getBpName(bp_id).bp_name;
var bp_code = getBpName(bp_id).bp_code;
//println(bp_code);
var hds = jm[key];
println(hds);
//转为数组
......@@ -60,7 +61,7 @@
//println(typeof hdsArr);
//println(hdsArr.length);
//压缩文件夹
var zip_filename = '['+bp_name+']'+bp_id+'电子发票.zip';
var zip_filename = '['+bp_name+']'+bp_code+'电子发票.zip';
var tranfer_file_path = file_dir + zip_filename;
var zipFile= new File(String(tranfer_file_path));
if(!zipFile.exists()){//如果文件夹不存在,创建文件夹
......
src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail.lview
View file @ ca50c851
......@@ -99,7 +99,6 @@
return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
}
if (name == 'attachment') {
if (record.get('invoice_kind') == '0') {
if (record.get('paid_byother_flag') == 'T') {
if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
......
src/main/webapp/modules/acr/ACR610/acr_invoice_apply_detail_wfl.lview
View file @ ca50c851
......@@ -99,7 +99,6 @@
return '<a href="javascript:acr610_detail_grid_readonly(' + record.id + ',' + record.get('invoice_hd_wfl_id') + ');">' + value + '</a>';
}
if (name == 'attachment') {
if (record.get('invoice_kind') == '0') {
if (record.get('paid_byother_flag') == 'T') {
if (record.get('guarantor_name_duty') != 'Y' || record.get('guarantor_name_duty') == 'NULL') {
......
src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail.lview
View file @ ca50c851
......@@ -33,7 +33,8 @@
url: $('acr620_invoice_reverse_save_link').getUrl(),
para: {
invoice_apply_id: '${/parameter/@invoice_apply_id}',
reverse_method: record.get('reverse_method')
reverse_method: record.get('reverse_method'),
note: record.get('note')
},
success: function () {
Leaf.SideBar.show({
......@@ -138,6 +139,7 @@
<a:field name="invoice_apply_date"/>
<a:field name="reverse_method_n" displayField="code_value_name" options="acr620_reverse_method_ds"
returnField="reverse_method" valueField="code_value" required="true" requiredMessage="请输入必输字段：反冲方式"/>
<a:field name="note" required="true" requiredMessage="请输入必输字段：反冲意见"/>
</a:fields>
<a:events>
<a:event name="load" handler="acr620_invoice_reverse_load"/>
......@@ -161,6 +163,9 @@
<a:textField name="invoice_apply_date" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="申请时间" width="135" readOnly="true"/>
<a:comboBox name="reverse_method_n" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲方式" width="135"/>
</a:hBox>
<a:hBox row="2" labelSeparator=" ">
<a:textArea name="note" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565"/>
</a:hBox>
</a:form>
<a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="135"
marginWidth="30" navBar="true">
......
src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail_wfl.lview
View file @ ca50c851
......@@ -101,6 +101,7 @@
<a:field name="invoice_apply_user_n"/>
<a:field name="invoice_apply_date"/>
<a:field name="reverse_method_n"/>
<a:field name="note"/>
</a:fields>
</a:dataSet>
<a:dataSet id="acr620_invoice_reverse_detail_result_ds" autoPageSize="true" autoQuery="true" fetchAll="true"
......@@ -133,6 +134,9 @@
<a:textField name="invoice_apply_date" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="申请时间" width="135" readOnly="true"/>
<a:comboBox name="reverse_method_n" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲方式" width="135" readOnly="true"/>
</a:hBox>
<a:hBox row="2" labelSeparator=" ">
<a:textArea name="note" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565" readOnly="true"/>
</a:hBox>
</a:form>
<a:switch test="/parameter/@button_flag">
<a:case value="YES">
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview
View file @ ca50c851
......@@ -59,8 +59,10 @@
// $('hls_ccb_grid_create_ds').query();
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody()); //解锁
},
error: function () {
Leaf.Masker.unmask(Ext.getBody()); //解锁
},
scope: this
});
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ ca50c851
......@@ -80,6 +80,12 @@
function csh511_receipt_save() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return;
}
}
// Leaf.Masker.mask(Ext.getBody());
// Leaf.request({
// url: $('csh510_update_bp_info_link').getUrl(),
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ ca50c851
......@@ -55,6 +55,12 @@
//不将这条数据传递到数组中
continue;
}
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return;
}
}
//否则的话添加必要的字段
record.set('receipt_type', 'IMPORT');
record.set('bank_account_num', record.get('attribute_1'));
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ ca50c851
......@@ -95,6 +95,14 @@
$('csh511_receipt_save').disable();
if ($('csh_transaction_receipt_head_ds').validate()) {
var record = $('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
$('csh511_receipt_save').enable();
return;
}
}
if (flag != 'Y') {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}');
}
......@@ -263,7 +271,7 @@
// record.getField('guarantor_name_duty_desc').setRequired(false);
// }
// }
else if (name =='bp_code') {
else if (name == 'bp_code') {
var bp_id = record.get('bp_id');
Leaf.request({
url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
......@@ -291,12 +299,12 @@
success: function (res) {
var unit_code = res.result.unit_code;
if (unit_code == 241 || unit_code == 610) {
if(record.get('paid_byother_flag') == 'T'){
if (record.get('paid_byother_flag') == 'T') {
record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true);
}else if(record.get('paid_byother_flag') == 'F'){
} else if (record.get('paid_byother_flag') == 'F') {
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
......@@ -333,10 +341,10 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else if(name == 'paid_byother_flag'){
if(record.get('paid_byother_flag') =='T'){
} else if (name == 'paid_byother_flag') {
if (record.get('paid_byother_flag') == 'T') {
var extra_id = record.get('bp_id');
if (extra_id != null){
if (extra_id != null) {
Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id},
......@@ -362,15 +370,15 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else {
} else {
record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true);
}
}else if(record.get('paid_byother_flag') =='F'){
} else if (record.get('paid_byother_flag') == 'F') {
var extra_id = record.get('bp_id');
if (extra_id != undefined){
if (extra_id != undefined) {
Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id},
......@@ -396,7 +404,7 @@
Leaf.Masker.unmask(Ext.getBody());
}
});
}else {
} else {
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
......@@ -405,6 +413,7 @@
}
}
}
// function onAdd_csh511_receipt(ds, record) {
// record.set('precision',2);
// record.set('zero_amounts_allowed','N');
......@@ -426,8 +435,8 @@
record.set('currency_name', '人民币');
record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N');
record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N');
}
......@@ -525,7 +534,7 @@
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
return;
}
}
......@@ -590,7 +599,8 @@
</a:field>
<!--担保人履行担保义务-->
<a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds" prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
<a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds"
prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
<a:field name="guarantor_name_duty" required="true"/>
<!-- <a:field name="bank_slip_num" lovGridHeight="350" lovHeight="600" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="1200" title="合同编号">
......@@ -669,8 +679,9 @@
<a:field name="bp_bank_account_num"/>
<a:field name="bp_bank_account_name" required="true"/>
<a:field name="collection_classes" />
<a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds" prompt="款项用途"
<a:field name="collection_classes"/>
<a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds"
prompt="款项用途"
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag"
displayField="code_value_name" valueField="code_value" required="true"/>
......@@ -749,7 +760,7 @@
<!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称" width="180" readOnly="true" />
prompt="代理店简称" width="180" readOnly="true"/>
</a:hBox>
<a:hBox style="width:800px">
......@@ -758,7 +769,7 @@
bindTarget="csh_transaction_receipt_head_ds"/>
<!--担保人履行担保义务-->
<a:comboBox name="guarantor_name_duty_desc" bindTarget="csh_transaction_receipt_head_ds"
prompt="担保人履行担保义务" width="180" />
prompt="担保人履行担保义务" width="180"/>
</a:hBox>
</a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
......
src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview
View file @ ca50c851
......@@ -390,6 +390,8 @@
readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag,
collection_classes:record.get('collection_classes'),
transaction_type:transaction_type||'RECEIPT',
winid: 'csh_write_off_window'
},
url: $('batch_detail_link').getUrl(),
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ ca50c851
......@@ -399,6 +399,8 @@
readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag,
collection_classes:record.get('collection_classes'),
transaction_type:transaction_type||'RECEIPT',
winid: 'csh_write_off_window'
},
url: $('batch_detail_link').getUrl(),
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview
View file @ ca50c851
......@@ -428,6 +428,9 @@
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="query_amount_flag_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="剩余可用金额"/>
<a:datePicker name="write_off_date_to"
bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="核销日期到"/>
</a:fieldSet>
</a:hBox>
</a:form>
......
src/main/webapp/modules/hls/HLS361N/hls_bp_mster_credit_record.lview
View file @ ca50c851
......@@ -29,8 +29,9 @@
<a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="hls_bp_master_credit_result_grid_ds" bindTarget="hls_bp_master_credit_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
<a:columns>
<a:column name="bp_code" prompt="代理店编码" align="center" width="120"/>
<a:column name="bp_name" prompt="代理店名称" align="center" width="170"/>
<a:column name="bp_code" prompt="授信对象编码" align="center" width="120"/>
<a:column name="bp_name" prompt="授信对象名称" align="center" width="170"/>
<a:column name="agent_name" prompt="代理店名称" align="center" width="170"/>
<a:column name="credit_total_amount" prompt="授信总额度" align="center" width="200" renderer="Leaf.formatMoney"/>
<a:column name="credit_date_from" prompt="授信日期从" align="center" width="120"/>
<a:column name="credit_date_to" prompt="授信日期到" width="110" align="center"/>
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_n.lview
View file @ ca50c851
......@@ -94,8 +94,8 @@
// Leaf.Masker.unmask(body);
// return false;
// }
if(H1>51){
Leaf.showMessage('${l:PROMPT}', '还款期数应小于51期');
if(H1>60){
Leaf.showMessage('${l:PROMPT}', '还款期数应小于60期');
Leaf.Masker.unmask(body);
return false;
}
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ ca50c851
......@@ -1524,8 +1524,8 @@
// Leaf.showMessage('${l:PROMPT}', '系统暂时不支持还款期数小于2期的租金计划');
// return false;
// }
if (H1 > 51) {
Leaf.showMessage('${l:PROMPT}', '还款期数应小于51期');
if (H1 > 60) {
Leaf.showMessage('${l:PROMPT}', '还款期数应小于60期');
unlock_calc_current_window();
return false;
}
......@@ -1553,7 +1553,7 @@
unlock_calc_current_window();
return;
}
//if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}' == 'LEASE') {
if ('${/parameter/@document_category}' == 'PROJECT'||'${/parameter/@document_category}' == 'CONTRACT') {
Leaf.request({
url: $('prj_check_prj_record_link_id').getUrl(),
para: {
......@@ -1719,47 +1719,47 @@
});
// } else {
// var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
// for (var i = 0; i < temp_head_records.length; i++) {
// if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
// $('temp_hd_attribute_ds').create(temp_head_records[i].data);
// }
// var H16;
// if (temp_head_records[i].get('column_code') == 'H16') {
// H16 = temp_head_records[i].get('column_value');
// }
// if (temp_head_records[i].get('column_code') == 'H109') {
// temp_head_records[i].set('column_value', H16);
// // temp_head_records[i].set('column_value_c',0);
// }
// }
// var all_records = $('temp_hd_attribute_ds').getAll();
// var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
// headRecord.isNew = false;
// headRecord.dirty = true;
// create_record_column(all_records, headRecord);
//
// function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
// if (typeof (nextStep) == 'function') {
// nextStep(source_procedure);
// } else {
// function on_ln_formula_load(ds) {
// Leaf.SideBar.enable = true;
// success_sidebar_show();
// unlock_calc_current_window();
// $('ln_formula_ds').un('load', on_ln_formula_load);
// }
//
// $('ln_formula_ds').on('load', on_ln_formula_load);
// $('ln_formula_ds').query();
// }
// }
//
// $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
// Leaf.SideBar.enable = false;
// $('hls_fin_cal_save_hd_ds').submit();
// }
} else {
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
for (var i = 0; i < temp_head_records.length; i++) {
if (!$('temp_hd_attribute_ds').find('column_code', temp_head_records[i].get('column_code'))) {
$('temp_hd_attribute_ds').create(temp_head_records[i].data);
}
var H16;
if (temp_head_records[i].get('column_code') == 'H16') {
H16 = temp_head_records[i].get('column_value');
}
if (temp_head_records[i].get('column_code') == 'H109') {
temp_head_records[i].set('column_value', H16);
// temp_head_records[i].set('column_value_c',0);
}
}
var all_records = $('temp_hd_attribute_ds').getAll();
var headRecord = $('hls_fin_cal_save_hd_ds').getAt(0);
headRecord.isNew = false;
headRecord.dirty = true;
create_record_column(all_records, headRecord);
function hls_fin_cal_save_hd_submitsuccess_new(ds, res) {
if (typeof (nextStep) == 'function') {
nextStep(source_procedure);
} else {
function on_ln_formula_load(ds) {
Leaf.SideBar.enable = true;
success_sidebar_show();
unlock_calc_current_window();
$('ln_formula_ds').un('load', on_ln_formula_load);
}
$('ln_formula_ds').on('load', on_ln_formula_load);
$('ln_formula_ds').query();
}
}
$('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess_new);
Leaf.SideBar.enable = false;
$('hls_fin_cal_save_hd_ds').submit();
}
}
......
src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_abc2_interface_excel_sheets.lsc
View file @ ca50c851
......@@ -66,7 +66,7 @@
for (var i = 0;i < export_data.length;i++) {
var f = export_data[i];
var write = "";
write = f.serial_no + split //顺序号
write = f.sequence_no + split //顺序号
+ f.dd_bank_account_num + split //账号
+ f.bp_name + split //户名
+ f.due_amount + split //金额
......
src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview
View file @ ca50c851
......@@ -38,15 +38,23 @@
debugger;
if ($('hls_acr_ebank_output_ds').validate()) {
var data = $('hls_acr_ebank_output_ds').getJsonData(false);
Leaf.Masker.mask(Ext.getBody(), '正在执行');
Leaf.request({
url: 'hls_acr_ebank_output_init.lsc',
para: data,
success: function (args) {
Leaf.Masker.unmask(Ext.getBody());
file_name = args.result.file_name;
output_id = args.result.record.output_id;
$('hls_acr_ebank_output_temp_ds').setQueryParameter('output_id', output_id);
$('hls_acr_ebank_output_temp_ds').query();
},
failure: function() {
Leaf.Masker.unmask(Ext.getBody());
},
error: function() {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}
......@@ -127,6 +135,7 @@
return;
}
if (hd_record.get('generate_rules') =='N'){
//add by wdd 20180530 for HL
//导出时相同客户账号不能有多条校验
var same_dd_bank_account_num_n = '';
......@@ -147,6 +156,7 @@
}
}
}
}
if (!Ext.isEmpty(same_dd_bank_account_num_n)) {
Leaf.showMessage('提示', '客户账号 ' + same_dd_bank_account_num_n + '存在多条，不可导出，请核实！');
return;
......@@ -232,9 +242,10 @@
<a:field name="currency_name" readOnly="true" defaultValue="人民币" displayField="currency_name"
options="hls_currency_ds" required="true" returnField="currency_code"
valueField="currency_code"/>
<a:field name="payment_method_display" displayField="code_value_name"
<a:field name="payment_method_display" readOnly="true" displayField="code_value_name"
options="hls_acr_payment_method_ds" required="true" returnField="payment_method"
valueField="code_value"/>
valueField="code_value" defaultValue="农行代扣（两方）"/>
<a:field name="payment_method" defaultValue="ABC_2" readOnly="true"/>
<!-- <a:field name="payment_method_display" defaultValue="ABC" displayField="code_value_name" readOnly="true" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
<!-- <a:field name="payment_method_display_n" defaultValue="农行代扣" displayField="code_value_name" readOnly="true" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/> -->
<a:field name="customer_type_display" displayField="code_value_name" options="hls_customer_type_ds"
......@@ -247,10 +258,10 @@
</a:mapping>
</a:field>
<a:field name="limit_amount" validator="amountValidator"/>
<a:field name="generate_rules_display" readOnly="true" defaultValue="汇总"
<a:field name="generate_rules_display" readOnly="true" defaultValue="明细到合同每期"
displayField="code_value_name" options="hls_generate_rules_ds" required="true"
returnField="generate_rules" valueField="code_value"/>
<a:field name="generate_rules" defaultValue="N"/>
<a:field name="generate_rules" defaultValue="Y"/>
<a:field name="contract_number"/>
</a:fields>
<a:events>
......@@ -289,9 +300,9 @@
<a:column name="bp_name" prompt="客户名称" width="150"/>
<a:column name="due_amount" align="right" prompt="应扣金额" renderer="numberRenderer" width="120"/>
<a:column name="id_card_no" prompt="证件号" width="150"/>
<!-- <a:column name="contract_number" prompt="合同编号" width="150"/>-->
<!-- <a:column name="times" prompt="期数" width="150"/>-->
<!-- <a:column name="due_date" prompt="计划付款日" width="150"/>-->
<a:column name="contract_number" prompt="合同编号" width="150"/>
<a:column name="times" prompt="期数" width="150"/>
<a:column name="due_date" prompt="计划付款日" width="150"/>
</a:columns>
</a:grid>
<a:hBox>
......
src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview
View file @ ca50c851
......@@ -21,8 +21,8 @@
var records = hd_ds.getSelected();
Leaf.showConfirm('${l:PROMPT}', '是否确定删除？', function() {
var detail_mask = Ext.getBody();
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
if (records.length) {
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
for (var i = 0;i < records.length;i++) {
var line_record = records[i];
if (line_record.get('handle_flag') == 'Y') {
......
src/main/webapp/modules/rpt/RPT5012/rpt5012_report.lview
View file @ ca50c851
......@@ -13,6 +13,7 @@
<a:link id="rpt5012_report_query_link" url="${/request/@context_path}/modules/rpt/RPT5012/rpt5012_repory_query.lview"/>
<a:link id="rpt5012_print_link_id" model="rpt.RPT5012.rpt5012_result_query" modelaction="execute"/>
<a:link id="rpt5012_csh_result_after_link_id" model="rpt.RPT5012.rpt5012_csh_result_after_query" modelaction="execute"/>
<script><![CDATA[
function rpt5012_reset() {
$('rpt5012_query_ds').reset();
......@@ -43,7 +44,7 @@
}
Leaf.request({
url: $('rpt5012_print_link_id').getUrl(),
url: $('rpt5012_csh_result_after_link_id').getUrl(),
para: {
month: month
},
......
src/main/webapp/modules/zjwfl/zj_wfl_workflow.lview
View file @ ca50c851
......@@ -76,6 +76,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="sub_category_ds" lookupCode="ZJ_WFL_SUB_CATEGORY"/>
<a:dataSet id="para_workflowDs" autoCreate="true" model="zjwfl.zj_wfl_workflow">
<a:fields>
......
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