Skip to content

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

[fix] 修复细节问题

parent 9c59f5ea
Hide whitespace changes
Inline Side-by-side
Showing with 360 additions and 83 deletions
src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
View file @ f8dec59b
......@@ -51,4 +51,62 @@ VALUES
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPB', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file
('CON733BPB', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPBQ', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733CF_Q','租金计划变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPT_Q','承租人变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_REPO001D_Q','回购申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_ET002_Q','提前结清申请明细',1,SYSDATE,-1,SYSDATE,-1);
\ No newline at end of file
src/main/database/Init/Sys_message/INITIALIZE_MESSAGE.sql
View file @ f8dec59b
......@@ -11,6 +11,10 @@ sys_message_pkg.delete_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR');
sys_message_pkg.insert_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR','错误','查找工作流节点接收人出现错误,请联系管理员!','ZHS');
sys_message_pkg.insert_message('ZJ_WFL_WORKFLOW_NODE_HIERARCHY_ERROR','Error','查找工作流节点接收人出现错误,请联系管理员!','US');
sys_message_pkg.delete_message('CON_CONTRACT_CHANGE_REQ_PKG.IS_CALC_FLAG_ERR');
sys_message_pkg.insert_message('CON_CONTRACT_CHANGE_REQ_PKG.IS_CALC_FLAG_ERR','错误','未完成报价，请先完成报价计算操作！','ZHS');
sys_message_pkg.insert_message('CON_CONTRACT_CHANGE_REQ_PKG.IS_CALC_FLAG_ERR','Error','未完成报价，请先完成报价计算操作！','US');
end;
/
commit;
......
src/main/database/Package/cus_con_change_req_pkg.pck
View file @ f8dec59b
......@@ -28,6 +28,10 @@
p_ccr_lease_interest out number, --应交利息
p_ccr_lease_penalty out number, --应交罚息
p_user_id in number);
--提交工作流
procedure submit_change_req(p_change_req_id in number,
p_layout_code in varchar2,
p_user_id in number);
end cus_con_change_req_pkg;
/
create or replace package body cus_con_change_req_pkg is
......@@ -256,5 +260,64 @@ create or replace package body cus_con_change_req_pkg is
when others then
null;
end calc_tenant_change_req;
--提交工作流
procedure submit_change_req(p_change_req_id in number,
p_layout_code in varchar2,
p_user_id in number) is
r_change_req_rec con_contract_change_req%rowtype;
r_change_con_rec con_contract%rowtype;
v_approval_method hls_document_type.approval_method%type;
e_change_req_status_error exception;
e_is_calc_flag_err exception;
begin
hls_document_compare_pkg.con_contract_compare(p_table_name => 'CON_CONTRACT',
p_change_req_id => p_change_req_id,
p_from_table_pk => '',
p_to_table_pk => p_change_req_id,
p_user_id => p_user_id);
r_change_req_rec := get_con_change_req_rec(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
r_change_con_rec := con_contract_pkg.get_contract_rec(p_contract_id => p_change_req_id,
p_user_id => p_user_id);
if r_change_req_rec.req_status not in ('NEW', 'REJECT') then
raise e_change_req_status_error;
end if;
--租金計劃變更需要校驗是否計算報價
if p_layout_code = 'CON_CHANGE_MODIFY' then
if nvl(r_change_req_rec.is_calc_flag, 'N') = 'N' then
raise e_is_calc_flag_err;
end if;
end if;
con_change_req_custom_pkg.before_submit_change_req(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
con_contract_history_pkg.calc_change_history(p_change_req_id => p_change_req_id,
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);
exception
when e_change_req_status_error then
sys_raise_app_error_pkg.raise_user_define_error(p_message_code => 'CON_CONTRACT_CHANGE_REQ_PKG.CHANGE_REQ_STATUS_ERROR',
p_created_by => p_user_id,
p_package_name => 'cus_con_change_req_pkg',
p_procedure_function_name => 'submit_change_req');
raise_application_error(sys_raise_app_error_pkg.c_error_number,
sys_raise_app_error_pkg.g_err_line_id);
when e_is_calc_flag_err then
sys_raise_app_error_pkg.raise_user_define_error(p_message_code => 'CON_CONTRACT_CHANGE_REQ_PKG.IS_CALC_FLAG_ERR',
p_created_by => p_user_id,
p_package_name => 'cus_con_change_req_pkg',
p_procedure_function_name => 'submit_change_req');
raise_application_error(sys_raise_app_error_pkg.c_error_number,
sys_raise_app_error_pkg.g_err_line_id);
end submit_change_req;
end cus_con_change_req_pkg;
/
src/main/database/Package/cus_con_change_req_wfl_pkg.pck 0 → 100644
View file @ f8dec59b
create or replace package cus_con_change_req_wfl_pkg is
-- Author : Spencer 3893
-- Created : 2019/9/25 13:51:00
-- Purpose : 合同變更工作流相關邏輯
procedure workflow_start(p_change_req_rec in con_contract_change_req%rowtype,
p_change_con_rec in con_contract%rowtype,
p_layout_code in varchar2,
p_user_id in number);
procedure workflow_approve(p_change_req_id in number,
p_user_id in number);
procedure workflow_reject(p_change_req_id in number, p_user_id in number);
procedure workflow_cancel(p_change_req_id in number, p_user_id in number);
end cus_con_change_req_wfl_pkg;
/
create or replace package body cus_con_change_req_wfl_pkg is
procedure workflow_start(p_change_req_rec in con_contract_change_req%rowtype,
p_change_con_rec in con_contract%rowtype,
p_layout_code in varchar2,
p_user_id in number) is
v_document_info varchar2(2000);
v_instance_id number;
v_bp_name varchar2(300);
v_workflow_desc varchar2(2000);
begin
select lv.bp_name
into v_bp_name
from con_contract_bp_tenant_lv lv
where lv.contract_id = p_change_con_rec.contract_id;
update con_contract_change_req t
set t.req_status = 'APPROVING',
t.submit_date = sysdate,
last_updated_by = p_user_id,
last_update_date = sysdate
where t.change_req_id = p_change_req_rec.change_req_id;
v_instance_id := p_change_req_rec.wfl_instance_id;
begin
select t1.workflow_desc
into v_workflow_desc
from hls_document_type_v t1
where t1.enabled_flag = 'Y'
and t1.document_type = p_change_req_rec.document_type
and t1.document_category = p_change_req_rec.document_category;
exception
when others then
null;
end;
v_document_info := v_workflow_desc || '：' ||
p_change_con_rec.contract_number || '-' || v_bp_name;
hls_workflow_pkg.workflow_start(p_instance_id => v_instance_id,
p_document_id => p_change_req_rec.change_req_id,
p_document_category => p_change_req_rec.document_category,
p_document_type => p_change_req_rec.document_type,
p_business_type => p_change_req_rec.business_type,
p_business_type_2nd => p_change_con_rec.business_type,
p_document_category_2nd => p_change_con_rec.document_category,
p_document_type_2nd => p_change_con_rec.document_type,
p_company_id => p_change_con_rec.company_id,
p_user_id => p_user_id,
p_lease_org => p_change_con_rec.lease_organization, --事业部
p_lease_channel => p_change_con_rec.lease_channel,
p_division => p_change_con_rec.division,
p_ccr_reschedule => p_change_req_rec.reschedule_flag,
p_ccr_et => p_change_req_rec.et_flag,
p_ccr_tenant_change => p_change_req_rec.tenant_change_flag,
p_ccr_lease_item_change => p_change_req_rec.lease_item_change_flag,
p_ccr_mortgage_change => p_change_req_rec.mortgage_change_flag,
p_ccr_guarantor_change => p_change_req_rec.guarantor_change_flag,
p_ccr_bank_acc_change => p_change_req_rec.bank_acc_change_flag,
p_ccr_contract_cancel => p_change_req_rec.contract_cancel_flag,
p_ccr_cashflow_change => p_change_req_rec.cashflow_change_flag,
-- parameter values
p_parameter_1 => 'NEW_CONTRACT_ID',
p_parameter_1_value => p_change_req_rec.change_req_id,
p_parameter_2 => 'OLD_CONTRACT_ID',
p_parameter_2_value => p_change_req_rec.contract_id,
p_parameter_4 => 'OWNER_USER_ID',
p_parameter_4_value => nvl(p_change_req_rec.owner_user_id,
p_user_id),
p_parameter_5 => 'CHANGE_REQ_ID',
p_parameter_5_value => p_change_req_rec.change_req_id,
p_parameter_6 => 'DOCUMENT_INFO',
p_parameter_6_value => v_document_info,
p_parameter_8 => 'CHANGE_REQ_NUMBER',
p_parameter_8_value => p_change_req_rec.change_req_number,
p_parameter_9 => 'PROJECT_ID',
p_parameter_9_value => p_change_con_rec.project_id,
p_parameter_10 => 'LAYOUT_CODE',
p_parameter_10_value => p_layout_code);
update con_contract_change_req t
set t.wfl_instance_id = v_instance_id
where t.change_req_id = p_change_req_rec.change_req_id;
exception
when no_data_found then
sys_raise_app_error_pkg.raise_user_define_error(p_message_code => 'CON_CONTRACT_CHG_REQ_WFL_PKG.NO_DATA_FOUND',
p_created_by => p_user_id,
p_package_name => 'cus_con_change_req_wfl_pkg',
p_procedure_function_name => 'workflow_start');
raise_application_error(sys_raise_app_error_pkg.c_error_number,
sys_raise_app_error_pkg.g_err_line_id);
when others then
sys_raise_app_error_pkg.raise_sys_others_error(p_message => dbms_utility.format_error_backtrace || ' ' ||
sqlerrm,
p_created_by => p_user_id,
p_package_name => 'cus_con_change_req_wfl_pkg',
p_procedure_function_name => 'workflow_start');
raise_application_error(sys_raise_app_error_pkg.c_error_number,
sys_raise_app_error_pkg.g_err_line_id);
end;
procedure workflow_approve(p_change_req_id in number,
p_user_id in number) is
begin
con_contract_change_req_pkg.change_req_confirm(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
end;
procedure workflow_reject(p_change_req_id in number, p_user_id in number) is
begin
con_contract_change_req_pkg.change_req_reject(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
end;
procedure workflow_cancel(p_change_req_id in number, p_user_id in number) is
begin
con_contract_change_req_pkg.change_req_cancel(p_change_req_id => p_change_req_id,
p_user_id => p_user_id);
end;
end cus_con_change_req_wfl_pkg;
/
src/main/database/Table/Alter/CON_CONTRACT.sql
View file @ f8dec59b
......@@ -48,4 +48,12 @@ is '逾期租金(回购)';
alter table CON_CONTRACT add SUM_UNRECEIVED_PRINCIPAL number;
comment on column CON_CONTRACT.SUM_UNRECEIVED_PRINCIPAL
is '剩余本金(回购)';
\ No newline at end of file
is '剩余本金(回购)';
alter table CON_CONTRACT add extend_flag varchar2(1);
comment on column CON_CONTRACT.extend_flag
is '是否展期';
alter table CON_CONTRACT add deflation_flag varchar2(1);
comment on column CON_CONTRACT.deflation_flag
is '是否缩期';
\ No newline at end of file
src/main/database/View/CON_CHANGE_CONTRACT_LV.sql
View file @ f8dec59b
......@@ -292,10 +292,10 @@ SELECT t1.contract_id,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code_value = t1.pay_method
and v.code='PAY_METHODS') PAYMENT_METHOD_ID_C, --现支付方式
t1.BANK_BRANCH_NAME BANK_FULL_NAME_C, --现扣款银行
t1.BANK_ACCOUNT_NAME BANK_ACCOUNT_NAME_C, --现扣款账户名
t1.BANK_BRANCH_NUM BANK_ACCOUNT_NUM_C --现扣款账号
and v.code='PAY_METHODS') PAY_METHOD_N, --现支付方式
t1.BANK_BRANCH_NAME , --现扣款银行
t1.BANK_ACCOUNT_NAME , --现扣款账户名
t1.BANK_BRANCH_NUM --现扣款账号
--回款賬戶變更 end
FROM con_contract t1
;
src/main/webapp/WEB-INF/classes/cont/CON731/submit_change_req.lwm
View file @ f8dec59b
......@@ -4,19 +4,14 @@
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" input="true" output="false"/>
<bm:parameter name="ccr_fee" input="true" output="false"/>
<bm:parameter name="ccr_penalty" input="true" output="false"/>
<bm:parameter name="btb_payment_date" input="true" output="false"/>
<bm:parameter name="layout_code" dataType="java.lang.String" input="true" output="false"/>
<bm:parameter name="user_id" dataType="java.lang.Long" input="true" output="false"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
CON_CHANGE_REQ_CALC_ITFC_PKG.SUBMIT_CHANGE_REQ
cus_con_change_req_pkg.SUBMIT_CHANGE_REQ
(
p_change_req_id=>${@change_req_id},
p_ccr_fee=>${@ccr_fee},
p_ccr_penalty=>${@ccr_penalty},
p_btb_payment_date=>to_date(${@btb_payment_date},'yyyy-mm-dd'),
p_layout_code=>${@layout_code},
p_user_id=>${/session/@user_id}
);
......
src/main/webapp/WEB-INF/server-script/layoutconfig/con_buyback_03_g_result_queryfields.js
View file @ f8dec59b
......@@ -36,7 +36,7 @@ var override_queryfields = [
queryoperator: "="
}, {
name: 'contract_name',
queryexpression: "t1.contract_number like ${@contract_number}"
queryexpression: "t1.contract_name like ${@contract_name}"
}, {
field: 'lease_channel',
queryoperator: "="
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ f8dec59b
......@@ -106,9 +106,6 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
var bp_info_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_bp');
var lease_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_lease_item');
var con_contract_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var con_contract_change_req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
if (ds.id == con_contract_change_req_ds_id) {
......@@ -136,40 +133,22 @@
scope: this
});
}
}
}
if (ds.id == con_contract_ds_id) {
//还款日变更时计算变更期数
if ('${/parameter/@layout_code}' == 'CCR_UNIVERSAL_PAYDATE') {
if (name == 'ccr_start_times' || name == 'btb_payment_date' || name == 'interim_rental') {
if (!(Ext.isEmpty(record.get('ccr_start_times'))) && !(Ext.isEmpty(record.get('btb_payment_date'))) && !(Ext.isEmpty(record.get('interim_rental')))) {
Leaf.request({
url: $('calc_pay_amount_link').getUrl(),
para: {
contract_id: record.get('contract_id'),
layout_code: '${/parameter/@layout_code}',
ccr_start_times: record.get('ccr_start_times'),
btb_payment_date: record.get('btb_payment_date'),
interim_rental: record.get('interim_rental')
},
success: function(res) {
record.set('ccr_fee', res.result.ccr_fee);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true,
scope: this
});
var ds_con_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_QUOTATION_01', 'con_contract');
if (ds.id == ds_con_id) {
// 回款賬戶變更
if('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY'){
if(name == 'BANK_BRANCH_NUM'){
var bank_account_num_s =record.get('bank_account_num_s');
if(bank_account_num_s == value){
Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
return;
}
}
}
}
}
}
};
//新增和加载时调用form
......@@ -184,35 +163,24 @@
var case_type = '';
var document_type = '${/parameter/@document_type}';
var calc_session_id = req_record.get('calc_session_id');
//承租人 ，租赁物
if (document_type == 'LEASSE_CHAG') {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
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}_save').disable();
$('${/parameter/@layout_code}_quote').disable();
$('${/parameter/@layout_code}_submit_approval').disable();
$('${/parameter/@layout_code}_user_button1').disable();
} else {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
}else {
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_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();
if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
$('${/parameter/@layout_code}_quote').disable();
}
$('${/parameter/@layout_code}_user_button1').disable();
$('${/parameter/@layout_code}_user_button2').disable();
setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
} else {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
}
};
function con731_submit() {
......@@ -223,9 +191,6 @@
url: $('con731_submit_link').getUrl(),
para: {
change_req_id: ${/parameter/@change_req_id},
ccr_fee: req_record.get('ccr_fee'),
ccr_penalty: req_record.get('ccr_penalty'),
btb_payment_date: req_record.get('btb_payment_date'),
layout_code: '${/parameter/@layout_code}'
},
success: function(res) {
......@@ -233,9 +198,23 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function() {
$('${/parameter/@layout_code}_submit_approval').enable();
$('${/parameter/@layout_code}_save').enable();
if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
$('${/parameter/@layout_code}_quote').enable();
}
$('${/parameter/@layout_code}_user_button1').enable();
$('${/parameter/@layout_code}_user_button2').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();
if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
$('${/parameter/@layout_code}_quote').enable();
}
$('${/parameter/@layout_code}_user_button1').enable();
$('${/parameter/@layout_code}_user_button2').enable();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
......@@ -506,7 +485,6 @@
}
};
window['${/parameter/@layout_code}_leasse_cdd_attachtment_upload'] = function(ds_id, id, name, query_only) {
var record = $(ds_id).findById(id);
if (record.get('contract_attch_id')) {
......
src/main/webapp/modules/cont/CON732/hls_ccr_query_entrance.lview
View file @ f8dec59b
......@@ -127,13 +127,14 @@
param['source_contract_id'] = record.get('source_contract_id');//變更前源合同id
param['contract_id'] = record.get('contract_id');
if (record.get('ccr_document_type') == 'CUT_CHAG') {
param['function_code'] = 'CON733CF';
param['function_code'] = 'CON733CF_Q';
param['url_title'] = '变更申请-合同回款账户变更查询';
} else if (record.get('ccr_document_type') == 'LEASE_CHAG') {
param['function_code'] = 'CON733BPT';
param['function_code'] = 'CON733BPT_Q';
param['url_title'] = '变更申请-合同回款账户变更查询';
} else if (record.get('ccr_document_type') == 'ACC_CHAG') {
param['function_code'] = 'CON733BPB';
//param['function_code'] = 'CON733BPB';
param['function_code'] = 'CON733BPBQ';
param['url_title'] = '变更申请-合同回款账户变更查询';
}
param['function_usage'] = 'QUERY';
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview
View file @ f8dec59b
......@@ -133,7 +133,7 @@
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="产品线"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
<!-- <a:textField name="received_times" bindTarget="contractQueryScreen_paraDs" prompt="已还款期数"/>-->
<!-- <a:comboBox name="contract_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="合同状态"/>-->
<a:comboBox name="overdue_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="是否逾期"/>
......@@ -144,7 +144,7 @@
<a:column name="contract_name" prompt="合同名称" width="120" align="left"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
<a:column name="division_n" prompt="产品线" width="120" align="left"/>
<a:column name="division_n" prompt="租赁物" width="120" align="left"/>
<a:column name="received_times" prompt="已还款期数" width="80" align="right"/>
<a:column name="status_desc" prompt="合同状态" width="120" align="center"/>
<a:column name="overdue_status" prompt="是否逾期" width="100" align="center"/>
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ f8dec59b
......@@ -131,7 +131,7 @@
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
<a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
<a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="产品线"/>
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
<a:textField name="req_employee_n" bindTarget="contractQueryScreen_paraDs" prompt="申请人"/>
<a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
</a:form>
......@@ -142,7 +142,7 @@
<a:column name="contract_name" prompt="合同名称" width="120" align="left"/>
<a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
<a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
<a:column name="division_n" prompt="产品线" width="120" align="left"/>
<a:column name="division_n" prompt="租赁物" width="120" align="left"/>
<a:column name="req_employee_n" prompt="申请人" width="80" align="right"/>
<a:column name="req_status_n" prompt="变更审批状态" width="100" align="center"/>
</a:columns>
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ f8dec59b
......@@ -5,7 +5,6 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure/>
<a:view>
<a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="con_repo_submit_link" model="" modelaction="execute"/>
<a:link id="con_repo001_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
<a:link id="con_repo001_calc_cashflow_link" model="cont.CON_REPO001.calc_cashflow" modelaction="execute"/>
......@@ -27,9 +26,27 @@
// $(ds_us_id).query();
// }
});
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
param['download'] = 'Y';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
//新增和加载时调用form
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var repurchase_types = record.get('repurchase_types');
if (repurchase_types == 'ONE_TIME_REPURCHASE') {
record.getField('payment_frequency_n').setRequired(false);
record.getField('payment_frequency').setRequired(false);
record.getField('payment_period').setRequired(false);
record.getField('payment_frequency_n').setReadOnly(true);
record.getField('payment_period').setReadOnly(true);
record.set('payment_period', 1);
}
};
// window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'] = function () {
// debugger;
......@@ -66,6 +83,7 @@
record.getField('payment_frequency_n').setReadOnly(true);
record.getField('payment_period').setReadOnly(true);
record.set('payment_period', 1);
record.set('payment_frequency', '');
if (name == 'ccr_due_amount') {
var due_amount = record.get('due_amount') || 0;
if (due_amount < value) {
......@@ -169,6 +187,7 @@
record.set('sum_overdue_amount', res.result.sum_overdue_amount);
record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
record.set('due_amount', res.result.due_amount);
record.set('ccr_due_amount', res.result.due_amount);
},
failure: function () {
......@@ -309,6 +328,17 @@
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, qpara, bp_seq) {
};
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record, bp_seq) {
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'contract_number' && value) {
return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}else if (name == 'description') {
if (record.get('important_flag') == 'Y') {
return '<font color="RED">' + value + '</font>';
}
return value;
}
}
]]></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