Skip to content

L
leaf-hlcm
Commit 3f77330f authored by Spencer Chang's avatar Spencer Chang
Browse files
Options

Merge branch 'feature/con_change_feature_v3' into develop

parents 50859ce8 05227de7
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 52 deletions
src/main/database/Package/cus_con_et_pkg.pck
View file @ 3f77330f
......@@ -164,18 +164,15 @@ create or replace package body cus_con_et_pkg is
and f.cf_type = 1
and f.contract_id = p_contract_id;
--上一次完全核销现金流
/*select (p_et_date - cwo.write_off_date) fund_possession_time
into v_fund_possession_time
from con_contract_cashflow f, csh_write_off cwo
where cwo.reversed_flag = 'N'
and cwo.cashflow_id = f.cashflow_id
and cwo.contract_id = p_contract_id
and f.due_date > p_et_date
and f.write_off_flag != 'NOT'
and f.cf_item = 1
and f.cf_type = 1
and f.contract_id = p_contract_id;*/
v_fund_possession_time := 11;
select (p_et_date - f.due_date + 1) fund_possession_time
into v_fund_possession_time
from con_contract_cashflow f
where f.due_date > p_et_date
and f.write_off_flag = 'FULL'
and f.cf_item = 1
and f.cf_type = 1
and f.cf_direction != 'NONCASH'
and f.contract_id = p_contract_id;
v_fund_possession_cost := v_sum_unreceived_principal *
nvl(v_fund_possession_time, 1) *
NVL(p_et_interest_rate,
......@@ -187,11 +184,12 @@ create or replace package body cus_con_et_pkg is
where f.write_off_flag != 'FULL'
and f.overdue_status = 'Y'
and f.cf_item = 1
and f.cf_type = 1
and f.cf_direction != 'NONCASH'
and f.contract_id = p_contract_id;
-- 逾期天数 overdue_max_days+现在至回购日天数
v_overdue_max_days := nvl(v_contract_rec.overdue_max_days, 0) +
trunc(p_et_date - sysdate);
v_fund_possession_time;
-- v_penalty 逾期罚息，逾期罚息=逾期租金* 逾期天数 * 0.0004。回购总额中罚息由系统自动计算，可直接进行手动调整，不需要通过罚息减免流程；逾期罚息，计算到回购解约日为止
v_penalty := v_sum_overdue_amount * v_overdue_max_days * 0.0004;
v_et_due_amount := v_sum_unreceived_principal + v_sum_overdue_amount;
......@@ -424,10 +422,10 @@ create or replace package body cus_con_et_pkg is
con_contract_history_pkg.calc_change_history(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
con_contract_change_req_wf_pkg.workflow_start(p_change_req_rec => r_change_req_rec,
p_change_con_rec => r_change_con_rec,
p_layout_code => p_layout_code,
p_user_id => p_user_id);
cus_con_change_req_wfl_pkg.workflow_start(p_change_req_rec => r_change_req_rec,
p_change_con_rec => r_change_con_rec,
p_layout_code => p_layout_code,
p_user_id => p_user_id);
end submit_change_req_et;
end cus_con_et_pkg;
/
src/main/database/View/con_contract_change_req_lv.sql
View file @ 3f77330f
......@@ -80,7 +80,8 @@ select t.change_req_id,
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
t.ccr_reason,
t.termination_date
--提前结清 end
from con_contract_change_req t,
con_contract cc
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 3f77330f
......@@ -697,6 +697,22 @@
};
/// 附件上传 end
//图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
var result = name.match(/(.*)_pic$/);
if (result) {
var pic_value = record.get(result[1]);
if (pic_value == 'OUTFLOW') {
return '<img src="${/request/@context_path}/images/outflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'INFLOW') {
return '<img src="${/request/@context_path}/images/inflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'NONCASH') {
return '<img src="${/request/@context_path}/images/noncash.png" style="margin-top:4px"/>';
} else if (pic_value == 'CASH') {
return '<img src="${/request/@context_path}/images/cash.png" style="margin-top:4px"/>';
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/cont/CON732/hls_ccr_modify_entrance.lview
View file @ 3f77330f
......@@ -84,9 +84,9 @@
var req_status = record.get('req_status');
var param = record.data;
var req_status = record.get('req_status');
param['change_req_id'] = record.get('contract_id');
param['change_req_id'] = record.get('change_req_id');
param['source_contract_id'] = record.get('source_contract_id');//變更前源合同id
param['contract_id'] = record.get('contract_id');
param['contract_id'] = record.get('change_req_id');
param['req_status'] = req_status;
if (req_status == 'APPROVED' || req_status == 'APPROVING' || req_status == 'CANCEL' || req_status == 'REJECT' ) {
......
src/main/webapp/modules/cont/CON732/hls_ccr_query_entrance.lview
View file @ 3f77330f
......@@ -58,27 +58,6 @@
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
function open_change_detail(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['change_req_id'] = record.get('contract_id');
param['contract_id'] = record.get('contract_id');
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
if (record.get('ccr_document_type') == 'CCHAG') {
param['function_code'] = 'CON732D';
param['url_title'] = '变更申请-报价信息变更 ';
} else if (record.get('ccr_document_type') == 'CGUTCHAG') {
param['function_code'] = 'CON732D_GUAR';
param['url_title'] = '变更申请-新增商业伙伴';
} else {
param['function_code'] = 'CON732D_BASIC';
param['url_title'] = '变更申请-常规信息调整 ';
}
param['document_type'] = record.get('ccr_document_type');
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
}
//工作流审批记录
function open_wfl_msg_detail(ds_id, record_id) {
......@@ -123,9 +102,9 @@
var req_status = record.get('req_status');
var param = record.data;
var req_status = record.get('req_status');
param['change_req_id'] = record.get('contract_id');
param['change_req_id'] = record.get('change_req_id');
param['source_contract_id'] = record.get('source_contract_id');//變更前源合同id
param['contract_id'] = record.get('contract_id');
param['contract_id'] = record.get('change_req_id');
if (record.get('ccr_document_type') == 'CUT_CHAG') {
param['function_code'] = 'CON733CF_Q';
param['url_title'] = '变更申请-合同回款账户变更查询';
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 3f77330f
......@@ -60,6 +60,7 @@
};
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
$('${/parameter/@layout_code}_submit_approval').disable();
var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
var req_record = $(req_ds_id).getAt(0);
var case_type = '';
......@@ -67,12 +68,17 @@
var calc_session_id = req_record.get('calc_session_id');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
if ($(req_ds_id).validate()) {
if (req_record.dirty) {
Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
// if (req_record.dirty) {
// Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// return;
// }
$('${/parameter/@layout_code}_submit_approval').disable();
$('${/parameter/@layout_code}_save').disable();
$('${/parameter/@layout_code}_user_button1').disable();
$('${/parameter/@layout_code}_user_button2').disable();
$('${/parameter/@layout_code}_user_button3').disable();
setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
} else {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -89,13 +95,28 @@
layout_code: '${/parameter/@layout_code}'
},
success: function(res) {
$('${/parameter/@layout_code}_submit_approval').enable();
$('${/parameter/@layout_code}_save').enable();
$('${/parameter/@layout_code}_user_button1').enable();
$('${/parameter/@layout_code}_user_button2').enable();
$('${/parameter/@layout_code}_user_button3').enable();
$('${/parameter/@winid}').close();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function() {
$('${/parameter/@layout_code}_submit_approval').enable();
$('${/parameter/@layout_code}_save').enable();
$('${/parameter/@layout_code}_user_button1').enable();
$('${/parameter/@layout_code}_user_button2').enable();
$('${/parameter/@layout_code}_user_button3').enable();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
$('${/parameter/@layout_code}_submit_approval').enable();
$('${/parameter/@layout_code}_save').enable();
$('${/parameter/@layout_code}_user_button1').enable();
$('${/parameter/@layout_code}_user_button2').enable();
$('${/parameter/@layout_code}_user_button3').enable();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
......@@ -112,6 +133,7 @@
if (ca_ds_id_c) {
$(ca_ds_id_c).query();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
//报价计算
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
......@@ -196,6 +218,23 @@
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, qpara, bp_seq) {
};
//图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
var result = name.match(/(.*)_pic$/);
if (result) {
var pic_value = record.get(result[1]);
if (pic_value == 'OUTFLOW') {
return '<img src="${/request/@context_path}/images/outflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'INFLOW') {
return '<img src="${/request/@context_path}/images/inflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'NONCASH') {
return '<img src="${/request/@context_path}/images/noncash.png" style="margin-top:4px"/>';
} else if (pic_value == 'CASH') {
return '<img src="${/request/@context_path}/images/cash.png" style="margin-top:4px"/>';
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview
View file @ 3f77330f
......@@ -28,7 +28,7 @@
var record = records[0],
contract_id = record.get('contract_id');
Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在回购期间无法进行后续操作，请谨慎操作！！！如果需要取消提前结清，请一定点击取消按钮！！！</span>', function () {
var ccr_document_type = 'ET';
var ccr_document_type = 'ET_CHAG';
Leaf.Masker.mask(Ext.getBody());
Leaf.request({
url: $('con_et_create_change_link').getUrl(),
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ 3f77330f
......@@ -44,7 +44,7 @@
param['url_title'] = '提前结清维护';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['document_type'] = 'ET';
param['document_type'] = 'ET_CHAG';
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');
}
......@@ -58,7 +58,7 @@
param['url_title'] = '提前结清明细';
param['function_usage'] = 'READONLY';
param['maintain_type'] = 'QUERY';
param['document_type'] = 'ET';
param['document_type'] = 'ET_CHAG';
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');
}
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ 3f77330f
......@@ -342,6 +342,22 @@
return value;
}
}
//图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
var result = name.match(/(.*)_pic$/);
if (result) {
var pic_value = record.get(result[1]);
if (pic_value == 'OUTFLOW') {
return '<img src="${/request/@context_path}/images/outflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'INFLOW') {
return '<img src="${/request/@context_path}/images/inflow.png" style="margin-top:4px"/>';
} else if (pic_value == 'NONCASH') {
return '<img src="${/request/@context_path}/images/noncash.png" style="margin-top:4px"/>';
} else if (pic_value == 'CASH') {
return '<img src="${/request/@context_path}/images/cash.png" style="margin-top:4px"/>';
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
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