Skip to content

L
leaf-hlcm
Commit 706767e4 authored by 18083's avatar 18083
Browse files
Options

新建代理店波雷顿提前结清保证金抵扣与北京心诚一致

parent 6dbd51a1
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 25 deletions
src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_early_termination_query.lwm
View file @ 706767e4
......@@ -154,23 +154,7 @@
t.data_class = 'NORMAL' AND
dt.document_type(+) = t.document_type AND
t.division != '95'
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:operation>
</bm:operations>
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 706767e4
......@@ -4,7 +4,7 @@
<a:init-procedure>
<a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}"
model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
</a:init-procedure>
<a:view>
......@@ -68,7 +68,18 @@
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
}else if('${/model/get_contract_division/record/@division}' =='70'){
if('${/model/get_contract_division/record/@division_detail}' =='03' ){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
}
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
}
//报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){
......@@ -907,6 +918,7 @@
}
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
debugger;
var gridId= ds.bindname+'_layout_grid_id';
//var division =$(project_ds_id).getAt(0).get('division');
if(record.data.division=='70' || record.data.division=='92'){
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 706767e4
......@@ -6,7 +6,7 @@
<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.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
</a:init-procedure>
......@@ -69,6 +69,17 @@
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}else if('${/model/get_contract_division/record/@division}' =='70'){
if('${/model/get_contract_division/record/@division_detail}' =='03' ){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
}
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
}
//报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
......@@ -82,14 +93,14 @@
var calc_flag='N';
//新增和加载时调用form
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
if (ds_id == ds.id && ds_id) {
if(record.get('bp_class') == 'NP'){
record.getField('signer_n').setReadOnly(true);
record.getField('signer_n').setRequired(false);
record.set('signer_n','');
}
if(record.get('division') == '70'){
if(record.get('division') == '70' && record.get('division_detail') == '01'){
record.getField('deposit_deduction').setRequired(true);
}
}
......@@ -131,7 +142,7 @@
record.set('et_total_amount',minus(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),value),record.get('deposit_deduction')||0));
}
//铁甲业务计算保证金抵扣金额 18083 2023/5/12
if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != ''){
if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != '' && '${/model/get_contract_division/record/@division_detail}' == '01'){
if (name == 'deposit_deduction') {
var et_total_amount=record.get('et_total_amount')||0;
var deposit_balance = record.get('deposit_balance') || 0;
......
src/main/webapp/modules/hls/HLS103/hls_division_detail.lview
View file @ 706767e4
......@@ -112,7 +112,7 @@
<!--<a:gridButton click="division_detail_delete" text="HLS.DELETE"/>-->
</a:screenTopToolbar>
<a:grid id="hls_division_detail_grid" bindTarget="hls_division_detail_result_ds" marginHeight="400" marginWidth="300">
<a:grid id="hls_division_detail_grid" bindTarget="hls_division_detail_result_ds" Height="200" width="600">
<a:columns>
<a:column name="description" align="left" sortable="true" width="100"/>
<a:column name="division_detail_code" align="center" prompt="产品线细分编码" editorFunction="divisionCodeFunction" width="100"/>
......@@ -124,7 +124,7 @@
<a:checkBox id="division_detail_grid_editor_check"/>
</a:editors>
</a:grid>
<a:grid id="hls_agent_division_detail_grid" bindTarget="hls_agent_division_detail_result_ds" marginHeight="200" marginWidth="300">
<a:grid id="hls_agent_division_detail_grid" bindTarget="hls_agent_division_detail_result_ds" Height="200" width="600">
<a:columns>
<a:column name="division_detail_code" prompt="产品线细分编码" align="left" sortable="true" width="100"/>
<a:column name="agent_bp_code" align="center" prompt="代理店编码" editorFunction="agentCodeFunction" width="100"/>
......
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