Skip to content

L
leaf-hlcm
Commit ace21748 authored by gzj34291's avatar gzj34291
Browse files
Options

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

parents 1953c8cb a4b2be30
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 41 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
View file @ ace21748
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
trunc(t2.due_date) < trunc(cc.CCR_LEASE_DATE)) trunc(t2.due_date) < trunc(cc.CCR_LEASE_DATE))
--合同状态为解约回购中、解约回购完成的合同 --合同状态为解约回购中、解约回购完成的合同
or (cc.contract_status in ('REPUR', 'REPURING') and( or (cc.contract_status in ('REPUR', 'REPURING') and(
trunc(t2.due_date) < trunc(cc.REPURCHASE_DATE) or t2.je_transaction_code='CON_REPURCHASE' ) ) trunc(t2.due_date) < trunc(cc.REPURCHASE_DATE) or t2.je_transaction_code='CON_REPURCHASE') or (t2.document_type = 'REPUR_CHAG'and t2.write_off_flag = 'FULL' ) ) --update by xsh35973 添加解约回购提前结清完全核销数据
--合同状态为起租→开票对象：非深圳美鹏HCS小规模纳税人（自然人）→暂不开票→按季度展示未开票现金流 --合同状态为起租→开票对象：非深圳美鹏HCS小规模纳税人（自然人）→暂不开票→按季度展示未开票现金流
or or
(cc.contract_status = 'INCEPT' and (cc.contract_status = 'INCEPT' and
......
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm 0 → 100644
View file @ ace21748
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-15 下午01:13:07
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V">
<bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
<bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" prompt="商业伙伴类型"/>
<bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
<!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
</bm:fields>
<bm:features>
<f:standard-who/>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
<bm:query-fields>
<bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field field="bp_code" queryOperator="like"/>
<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
<!-- <bm:query-field field="bp_category" queryOperator="="/> -->
<bm:query-field field="bp_category" queryExpression="(t1.bp_category = ${@bp_category} or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.bp_category = ${@bp_category} and br.bp_type = ${@bp_category}))"/>
<bm:query-field field="bp_category_name" queryExpression="(t1.bp_category_name like &apos;%&apos;||${@bp_category_name}||&apos;%&apos;)"/>
<!-- <bm:query-field name="contract_bp_flag" queryExpression="(exists (select 1 from con_contract_bp b where b.contract_id in (${:@contract_id}) and b.bp_id = t1.bp_id and b.bp_category in (&apos;VENDER&apos;,&apos;TENANT&apos;,&apos;TENANT_SEC&apos;) )or nvl(${@contract_bp_flag},&apos;N&apos;) != &apos;Y&apos; )"/> -->
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
<bm:data-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.bp_category in('TENANT','AGENT') and br.bp_type in('TENANT','AGENT')))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_early_termination_query.lwm
View file @ ace21748
...@@ -150,10 +150,25 @@ ...@@ -150,10 +150,25 @@
WHERE WHERE
t.bp_id_tenant = b.bp_id(+) AND t.bp_id_tenant = b.bp_id(+) AND
t.contract_status = 'INCEPT' AND t.contract_status in ('INCEPT','REPURING') AND
t.data_class = 'NORMAL' AND t.data_class = 'NORMAL' AND
dt.document_type(+) = t.document_type dt.document_type(+) = t.document_type
and (t.bp_id_agent_level1 = (select t.bp_id from sys_user s, exp_employees e, exp_employee_assigns a, exp_org_position pp,hls_bp_master t
where a.position_id = pp.position_id
and a.employee_id = e.employee_id
and s.employee_id = e.employee_id
and pp.unit_id = t.unit_id
and a.enabled_flag = 'Y'
and e.enabled_flag = 'Y'
and a.primary_position_flag = 'Y'
and pp.enabled_flag = 'Y'
and t.bp_type = 'AGENT'
and s.user_id = ${/session/@user_id}) or not exists (select 1
from sys_user_role_groups g, sys_role r
where g.role_id = r.role_id
and g.user_id = ${/session/@user_id}
and r.role_code in ('0018','0019')
and trunc(sysdate) <= nvl(g.end_date, trunc(sysdate))))
) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE# ) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_get_contract_status.lwm 0 → 100644
View file @ ace21748
<?xml version="1.0" encoding="UTF-8"?>
<!--
@Author: xsh 35973
@Date: 2022/6/13 13:59
@Revision: 1.0
@Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:fields>
<bm:field name="contract_status"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select contract_status from con_contract t1 #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
cus_con_et_pkg.check_cashflow_write_off(p_contract_id =>${@contract_id},
p_user_id =>${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ ace21748
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
<bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" /> <bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" />
<bm:field name="guarantor_name_duty" /> <bm:field name="guarantor_name_duty" />
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/> <bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
<bm:field name="import_source"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
...@@ -164,5 +165,6 @@ ...@@ -164,5 +165,6 @@
<bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/> <bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/> <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>
<bm:query-field name="extra_nam" queryExpression="(SELECT cc.extra_nam FROM hls_bp_master cc WHERE cc.enabled_flag = 'Y' and cc.bp_category = 'AGENT' and cc.bp_id = t1.bp_id ) like &apos;%&apos;||upper(${@extra_nam})||&apos;%&apos;"/> <bm:query-field name="extra_nam" queryExpression="(SELECT cc.extra_nam FROM hls_bp_master cc WHERE cc.enabled_flag = 'Y' and cc.bp_category = 'AGENT' and cc.bp_id = t1.bp_id ) like &apos;%&apos;||upper(${@extra_nam})||&apos;%&apos;"/>
<bm:query-field field="import_source" queryOperator="="/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ ace21748
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
li.line_number, li.line_number,
hd.created_by, hd.created_by,
li.source_table, li.source_table,
'03399500040009165' bank_num, --update by xsh35973
'人民币' currency_type, --update by xsh35973
li.attribute_1, li.attribute_1,
li.attribute_2, li.attribute_2,
li.attribute_3, li.attribute_3,
...@@ -165,7 +167,8 @@ ...@@ -165,7 +167,8 @@
p_ref_v05 =>${@ref_v05}, p_ref_v05 =>${@ref_v05},
p_status =>${@status}, p_status =>${@status},
p_bank_account_num =>${@bank_account_num}, p_bank_account_num =>${@bank_account_num},
p_guarantor_name_duty =>${@guarantor_name_duty} p_guarantor_name_duty =>${@guarantor_name_duty},
p_import_source => 'EXCEL_ADD'
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm
View file @ ace21748
...@@ -75,7 +75,8 @@ ...@@ -75,7 +75,8 @@
p_paid_byother_flag =>${@paid_byother_flag}, p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05}, p_ref_v05 =>${@ref_v05},
p_status =>${@status}, p_status =>${@status},
p_guarantor_name_duty=>${@guarantor_name_duty} p_guarantor_name_duty=>${@guarantor_name_duty},
p_import_source =>'HAND_ADD'
); );
end; end;
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm
View file @ ace21748
...@@ -108,7 +108,7 @@ end; ...@@ -108,7 +108,7 @@ end;
<bm:field name="unreceived_amount" expression="(select ca.due_amount - nvl(ca.received_amount,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/> <bm:field name="unreceived_amount" expression="(select ca.due_amount - nvl(ca.received_amount,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/>
<bm:field name="left_principal" expression="(select ca.principal - nvl(ca.received_principal,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/> <bm:field name="left_principal" expression="(select ca.principal - nvl(ca.received_principal,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/>
<bm:field name="left_interest" expression="(select ca.interest - nvl(ca.received_interest,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/> <bm:field name="left_interest" expression="(select ca.interest - nvl(ca.received_interest,0) from con_contract_cashflow ca where ca.cashflow_id = t1.write_off_cashflow_id)" forInsert="false" forUpdate="false"/>
<bm:field name="unreceived_penalty" expression="(select ca.due_amount - nvl(ca.received_amount,0) from con_contract_cashflow ca where ca.contract_id = t1.contract_id and ca.times = t1.write_off_times and cf_item = 9)" forInsert="false" forUpdate="false"/> <bm:field name="unreceived_penalty" expression="(select ca.due_amount - nvl(ca.received_amount,0) from con_contract_cashflow ca where ca.contract_id = t1.contract_id and ca.times = t1.write_off_times and cf_item = 9 and cf_status = 'RELEASE')" forInsert="false" forUpdate="false"/>
<bm:field name="agent_id" databaseType="NUMBER" datatype="java.lang.Long"/> <bm:field name="agent_id" databaseType="NUMBER" datatype="java.lang.Long"/>
<bm:field name="agent_id_desc" expression="(select hbm.bp_name from hls_bp_master hbm where hbm.bp_id = t1.agent_id)" forUpdate="false" forInsert="false"/> <bm:field name="agent_id_desc" expression="(select hbm.bp_name from hls_bp_master hbm where hbm.bp_id = t1.agent_id)" forUpdate="false" forInsert="false"/>
<bm:field name="write_off_classification" lookupField="write_off_classification_desc" lookupCode="DS_CSH_WRITE_OFF_CLASSIFICATION" databaseType="VARCHAR2" datatype="java.lang.String" /> <bm:field name="write_off_classification" lookupField="write_off_classification_desc" lookupCode="DS_CSH_WRITE_OFF_CLASSIFICATION" databaseType="VARCHAR2" datatype="java.lang.String" />
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ ace21748
...@@ -446,7 +446,40 @@ ...@@ -446,7 +446,40 @@
} }
} }
//add by xsh35973 调整后不为默认值高亮显示
//调整后逾期罚息
debugger;
var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
if (ds_id_req == ds.id && ds_id_req) {
if (record.get('ccr_penalty') != record.get('penalty')) {
var req_change_id_1 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_CCR_PENALTY');
var req_change_input_1 = req_change_id_1.getElementsByTagName('input');
req_change_input_1[0].style.setProperty('background-color', '#FF9965', 'important');
}
;
//调整后资金占用费
if (record.get('fund_possession_cost') != record.get('ccr_fund_possession_cost')) {
var req_change_id_2 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_FUND_POSSESSION_COST');
var req_change_input_2 = req_change_id_2.getElementsByTagName('input');
req_change_input_2[0].style.setProperty('background-color', '#FF9965', 'important');
}
;
//调整后提前结清手续费
var et_fee = record.get('et_fee');
if (et_fee != 500 && typeof (et_fee) != 'undefined') {
var req_change_id_3 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ET_FEE');
var req_change_input_3 = req_change_id_3.getElementsByTagName('input');
req_change_input_3[0].style.setProperty('background-color', '#FF9965', 'important');
}
;
//调整后留购价
var residual_value = record.get('residual_value')
if (residual_value != 0 && typeof (residual_value) != 'undefined') {
var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
};
}
}; };
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
...@@ -630,7 +663,7 @@ ...@@ -630,7 +663,7 @@
Leaf.request({ Leaf.request({
url: $('con731_cancel_link').getUrl(), url: $('con731_cancel_link').getUrl(),
para: { para: {
change_req_id: ${/parameter/@change_req_id} change_req_id: '${/parameter/@change_req_id}'
}, },
success: function (res) { success: function (res) {
// $('${/parameter/@layout_code}_user_button1').enable(); // $('${/parameter/@layout_code}_user_button1').enable();
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ ace21748
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/> <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
...@@ -146,7 +147,7 @@ ...@@ -146,7 +147,7 @@
/**提前结清利率**/ /**提前结清利率**/
et_interest_rate: record.get('et_interest_rate'), et_interest_rate: record.get('et_interest_rate'),
/**留购价**/ /**留购价**/
residual_value: record.get('residual_value') residual_value: record.get('ccr_residual_value') //update by xsh35973 20220613
}, },
success: function (res) { success: function (res) {
//record.set('et_fee', res.result.et_fee); //record.set('et_fee', res.result.et_fee);
...@@ -158,6 +159,7 @@ ...@@ -158,6 +159,7 @@
record.set('ccr_penalty', res.result.penalty || 0); record.set('ccr_penalty', res.result.penalty || 0);
record.set('fund_possession_time', res.result.fund_possession_time); record.set('fund_possession_time', res.result.fund_possession_time);
record.set('fund_possession_cost', res.result.fund_possession_cost); record.set('fund_possession_cost', res.result.fund_possession_cost);
record.set('ccr_fund_possession_cost', res.result.fund_possession_cost); //add by xsh35973 20220610
record.set('fund_possession_rate', res.result.fund_possession_rate); record.set('fund_possession_rate', res.result.fund_possession_rate);
record.set('last_rent_due_date', res.result.last_rent_due_date); record.set('last_rent_due_date', res.result.last_rent_due_date);
record.set('sum_unreceived_principal', res.result.sum_unreceived_principal); record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
...@@ -191,7 +193,43 @@ ...@@ -191,7 +193,43 @@
scope: this scope: this
}); });
} }
//add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
if(name == 'fund_possession_cost'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
setTimeout(function () {
record.set('fund_possession_cost', 0);
}, 5);
return;
}
var sum_unreceived_principal = record.get('sum_unreceived_principal') || 0;
if(sum_unreceived_principal !=0) {
var et_due_amount_result = plus(sum_unreceived_principal, value);
record.set('et_due_amount', et_due_amount_result);
}
}
if(name == 'residual_value'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的留购金金额应大于等于0！');
setTimeout(function () {
record.set('residual_value', 0);
}, 5);
return;
}
var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty'));
record.set('et_total_amount',et_total_amount_result);
}
if(name == 'et_due_amount'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
setTimeout(function () {
record.set('et_due_amount', 0);
}, 5);
return;
}
var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty'));
record.set('et_total_amount',et_total_amount_result);
}
} }
}; };
...@@ -221,7 +259,28 @@ ...@@ -221,7 +259,28 @@
// $('${/parameter/@layout_code}_user_button3').disable(); // $('${/parameter/@layout_code}_user_button3').disable();
//setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000); //setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
// window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit); // window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit);
con_repo001_submit(); //解约回购合同增加提交审批前是否完全核销校验 add by xsh35973
if('${/model/get_contract_status/record/@contract_status}' =='REPURING'){
Leaf.request({
url: '${/request/@context_path}/autocrud/cont.CON_ET001.con_get_contract_status/execute',
para: {
contract_id: '${/parameter/@contract_id}'
},
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
con_repo001_submit();
},
failure: function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}else {
con_repo001_submit();
};
} else { } else {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
} }
...@@ -243,7 +302,7 @@ ...@@ -243,7 +302,7 @@
Leaf.request({ Leaf.request({
url: $('${/parameter/@layout_code}_con_ele_sign_cancel_link_id').getUrl(), url: $('${/parameter/@layout_code}_con_ele_sign_cancel_link_id').getUrl(),
para: { para: {
contract_id: ${/parameter/@change_req_id} contract_id: '${/parameter/@change_req_id}'
}, },
scope: this, scope: this,
success: function (res) { success: function (res) {
...@@ -258,7 +317,7 @@ ...@@ -258,7 +317,7 @@
Leaf.request({ Leaf.request({
url: $('con_et002_submit_link').getUrl(), url: $('con_et002_submit_link').getUrl(),
para: { para: {
change_req_id: ${/parameter/@change_req_id}, change_req_id: '${/parameter/@change_req_id}',
layout_code: '${/parameter/@layout_code}' layout_code: '${/parameter/@layout_code}'
}, },
success: function(res) { success: function(res) {
...@@ -310,7 +369,7 @@ ...@@ -310,7 +369,7 @@
Leaf.request({ Leaf.request({
url: $('con_et002_submit_link').getUrl(), url: $('con_et002_submit_link').getUrl(),
para: { para: {
change_req_id: ${/parameter/@change_req_id}, change_req_id: '${/parameter/@change_req_id}',
layout_code: '${/parameter/@layout_code}' layout_code: '${/parameter/@layout_code}'
}, },
success: function(res) { success: function(res) {
...@@ -417,7 +476,7 @@ ...@@ -417,7 +476,7 @@
Leaf.request({ Leaf.request({
url: $('${/parameter/@layout_code}_con_ele_sign_cancel_link_id').getUrl(), url: $('${/parameter/@layout_code}_con_ele_sign_cancel_link_id').getUrl(),
para: { para: {
contract_id: ${/parameter/@change_req_id} contract_id: '${/parameter/@change_req_id}'
}, },
scope: this, scope: this,
success: function (res) { success: function (res) {
...@@ -429,7 +488,7 @@ ...@@ -429,7 +488,7 @@
Leaf.request({ Leaf.request({
url: $('con_et002_cancel_link').getUrl(), url: $('con_et002_cancel_link').getUrl(),
para: { para: {
change_req_id: ${/parameter/@change_req_id} change_req_id: '${/parameter/@change_req_id}'
}, },
success: function(res) { success: function(res) {
$('${/parameter/@layout_code}_user_button3').enable(); //按钮启用 $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用
...@@ -473,6 +532,11 @@ ...@@ -473,6 +532,11 @@
Leaf.showMessage('${l:PROMPT}', '只有新建状态的才能发起电子签约'); Leaf.showMessage('${l:PROMPT}', '只有新建状态的才能发起电子签约');
return; return;
}*/ }*/
//解约回购的合同发起提前结清时，不能发起电子签约 add by xsh35973
if('${/model/get_contract_status/record/@contract_status}' =='REPURING'){
Leaf.showMessage('${l:PROMPT}', '解约回购的合同发起提前结清时，不能发起电子签约');
return;
};
if(bussiness_type == 'LEASEBACK' && bp_tenant_class == 'NP'){ if(bussiness_type == 'LEASEBACK' && bp_tenant_class == 'NP'){
Leaf.showMessage('${l:PROMPT}', '业务类型为售后回租且是个人承租人的合同，不能发起电子签约'); Leaf.showMessage('${l:PROMPT}', '业务类型为售后回租且是个人承租人的合同，不能发起电子签约');
return; return;
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview
View file @ ace21748
...@@ -29,8 +29,14 @@ ...@@ -29,8 +29,14 @@
var records = $('contractQueryScreen_mainDs').getSelected(); var records = $('contractQueryScreen_mainDs').getSelected();
var record = records[0], var record = records[0],
contract_id = record.get('contract_id'); contract_id = record.get('contract_id');
var ccr_document_type;
Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在回购期间无法进行后续操作，请谨慎操作！！！如果需要取消提前结清，请一定点击取消按钮！！！</span>', function () { Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在回购期间无法进行后续操作，请谨慎操作！！！如果需要取消提前结清，请一定点击取消按钮！！！</span>', function () {
var ccr_document_type = 'ET_CHAG'; //新增解约回购提前结清单据类型addby xsh35973 20220615
if (record.get('contract_status')=='REPURING'){
ccr_document_type = 'REPUR_CHAG';
}else {
ccr_document_type = 'ET_CHAG';
};
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
Leaf.request({ Leaf.request({
url: $('con_et_create_change_link').getUrl(), url: $('con_et_create_change_link').getUrl(),
...@@ -75,8 +81,14 @@ ...@@ -75,8 +81,14 @@
var records = $('contractQueryScreen_mainDs').getSelected(); var records = $('contractQueryScreen_mainDs').getSelected();
var record = records[0], var record = records[0],
contract_id = record.get('contract_id'); contract_id = record.get('contract_id');
var ccr_document_type;
Leaf.showConfirm('提示', '<span style="color: #ff0000;font-size: 15px; ">该操作不会对合同还款计划产生变更，仅试算用途；若需提交提前结清申请，请点击主界面【创建】按钮！</span>', function () { Leaf.showConfirm('提示', '<span style="color: #ff0000;font-size: 15px; ">该操作不会对合同还款计划产生变更，仅试算用途；若需提交提前结清申请，请点击主界面【创建】按钮！</span>', function () {
var ccr_document_type = 'ET_CHAG'; //新增解约回购提前结清单据类型addby xsh35973 20220615
if (record.get('contract_status')=='REPURING'){
ccr_document_type = 'REPUR_CHAG';
}else {
ccr_document_type = 'ET_CHAG';
};
Leaf.Masker.mask(Ext.getBody(), '正在创建试算，，，'); Leaf.Masker.mask(Ext.getBody(), '正在创建试算，，，');
Leaf.request({ Leaf.request({
url: $('con_et_create_change_link').getUrl(), url: $('con_et_create_change_link').getUrl(),
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ ace21748
...@@ -47,7 +47,13 @@ ...@@ -47,7 +47,13 @@
return false; return false;
} }
var record = records[0]; var record = records[0];
var ccr_document_type = 'ET'; //update by xsh35973 增加回购提前结清合同文本生成
var ccr_document_type;
if (record.get('contract_status') == 'REPURING'){
ccr_document_type = 'REPUR_CHAG'
}else{
ccr_document_type = 'ET';
};
//var req_status = record.get('req_status'); //var req_status = record.get('req_status');
var contract_id = record.get('change_req_id'); var contract_id = record.get('change_req_id');
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ ace21748
...@@ -500,6 +500,7 @@ ...@@ -500,6 +500,7 @@
</a:dataSet> </a:dataSet>
<a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY"> <a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">
</a:dataSet> </a:dataSet>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<!-- <a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">--> <!-- <a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">-->
<!-- </a:dataSet>--> <!-- </a:dataSet>-->
<a:dataSet id="payment_method_ds"> <a:dataSet id="payment_method_ds">
...@@ -684,15 +685,17 @@ ...@@ -684,15 +685,17 @@
<a:mapping> <a:mapping>
<a:map from="extra_nam" to="extra_nam"/> <a:map from="extra_nam" to="extra_nam"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="csh510_receipt_maintain_update"/> <a:event name="update" handler="csh510_receipt_maintain_update"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="csh.CSH510.csh_transaction_miantain_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true"> <a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="csh.CSH510.csh_transaction_miantain_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true">
<a:fields>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
...@@ -738,6 +741,7 @@ ...@@ -738,6 +741,7 @@
<!-- <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>--> <!-- <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->
<a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/> <a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="代理店简称"/> <a:lov name="extra_nam" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="代理店简称"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="新增路径"/>
</a:fieldSet> </a:fieldSet>
...@@ -763,6 +767,7 @@ ...@@ -763,6 +767,7 @@
<a:column name="guarantor_name_duty_desc" prompt="担保人履行担保义务" align="center"/> <a:column name="guarantor_name_duty_desc" prompt="担保人履行担保义务" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/> <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
<a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/> <a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" align="center"/> <a:column name="confirmed_flag_desc" prompt="单据审批状态" align="center"/>
<!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>--> <!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>-->
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT"> <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ ace21748
...@@ -63,17 +63,17 @@ ...@@ -63,17 +63,17 @@
} }
//否则的话添加必要的字段 //否则的话添加必要的字段
record.set('receipt_type', 'IMPORT'); record.set('receipt_type', 'IMPORT');
record.set('bank_account_num', record.get('attribute_1')); record.set('bank_account_num', record.get('bank_num'));
// record.set('transaction_date', Leaf.formatDate(record.get('attribute_3'))); // record.set('transaction_date', Leaf.formatDate(record.get('attribute_3')));
record.set('bank_slip_num', record.get('attribute_5')); record.set('bank_slip_num', record.get('attribute_17'));
record.set('currency_code', 'CNY'); record.set('currency_code', 'CNY');
record.set('transaction_amount', record.get('attribute_14')); record.set('transaction_amount', record.get('attribute_3'));
record.set('exchange_rate', 1); record.set('exchange_rate', 1);
record.set('bp_bank_account_num', record.get('attribute_8')); record.set('bp_bank_account_num', record.get('attribute_11'));
record.set('bp_bank_account_name', record.get('attribute_9')); record.set('bp_bank_account_name', record.get('attribute_12'));
record.set('opposite_band_na', record.get('attribute_10')); record.set('opposite_band_na', record.get('attribute_8'));
record.set('description', record.get('attribute_23')); record.set('description', record.get('attribute_14'));
record.set('ref_v05', record.get('attribute_24')); record.set('ref_v05', record.get('attribute_15'));
record.set('write_off_flag', 'DISABLED'); record.set('write_off_flag', 'DISABLED');
...@@ -456,25 +456,25 @@ ...@@ -456,25 +456,25 @@
width="980" rowRenderer="change_background_color"> width="980" rowRenderer="change_background_color">
<a:columns> <a:columns>
<a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/> <a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
<a:column name="attribute_1" prompt="账号" width="80"/> <a:column name="bank_num" prompt="账号" width="80"/>
<a:column name="attribute_2" prompt="货币" width="80"/> <a:column name="currency_type" prompt="货币" width="80"/>
<a:column name="transaction_date" prompt="交易日期" renderer="Leaf.formatDate" width="80"/> <a:column name="attribute_1" prompt="交易日期" renderer="Leaf.formatDate" width="80"/>
<!-- <a:column name="attribute_4" prompt="交易时间" width="80"/>--> <!-- <a:column name="attribute_4" prompt="交易时间" width="80"/>-->
<a:column name="attribute_5" prompt="日志号" width="80"/> <a:column name="attribute_17" prompt="日志号" width="80"/>
<a:column name="attribute_8" prompt="对方账号" width="80"/> <a:column name="attribute_11" prompt="对方账号" width="80"/>
<a:column name="attribute_9" prompt="对方账号户名" width="80"/> <a:column name="attribute_12" prompt="对方账号户名" width="80"/>
<a:column name="attribute_10" prompt="对方银行名称" width="80"/> <a:column name="attribute_8" prompt="对方银行名称" width="80"/>
<a:column name="bp_name" prompt="收款对象" editor="grid_lov" width="120"/> <a:column name="bp_name" prompt="收款对象" editor="grid_lov" width="120"/>
<a:column name="paid_byother_flag_desc" prompt="是否代付" editor="grid_cb"/> <a:column name="paid_byother_flag_desc" prompt="是否代付" editor="grid_cb"/>
<a:column name="attribute_14" prompt="收款金额" renderer="Leaf.formatMoney" align="right" <a:column name="attribute_3" prompt="收款金额" renderer="Leaf.formatMoney" align="right"
width="80"/> width="80"/>
<a:column name="attribute_23" prompt="摘要" width="80"/> <a:column name="attribute_14" prompt="摘要" width="80"/>
<a:column name="collection_classes_desc" prompt="款项分类" editor="grid_cb"/> <a:column name="collection_classes_desc" prompt="款项分类" editor="grid_cb"/>
<a:column name="attribute_24" prompt="附言" width="80"/> <a:column name="attribute_15" prompt="附言" width="80"/>
<a:column name="extra_nam" prompt="代理店简称" width="80" editor="grid_lov" /> <a:column name="extra_nam" prompt="代理店简称" width="80" editor="grid_lov" />
<a:column name="bp_code" prompt="代理店简称code" hidden="true"/> <a:column name="bp_code" prompt="代理店简称code" hidden="true"/>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ ace21748
...@@ -575,7 +575,7 @@ ...@@ -575,7 +575,7 @@
<a:field name="functional_currency_code" <a:field name="functional_currency_code"
defaultValue="${/model/default_exchange_rate_type_path/record/@functional_currency_code}"/> defaultValue="${/model/default_exchange_rate_type_path/record/@functional_currency_code}"/>
<a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90" <a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
lovService="basic.hls_bp_master_v_for_lov?bp_category=TENANT" lovWidth="550" title="HLS.BP_TITLE"> lovService="basic.hls_bp_master_v_for_agent_lov" lovWidth="550" title="HLS.BP_TITLE">
<a:mapping> <a:mapping>
<a:map from="bp_id" to="bp_id"/> <a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/> <a:map from="bp_name" to="bp_name"/>
......
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