Skip to content

L
leaf-hlcm
Commit 939d7096 authored by 18083's avatar 18083
Browse files
Options

建机收款规则变更调整

parent 39d9eb43
Show whitespace changes
Inline Side-by-side
Showing with 386 additions and 2 deletions
src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm
View file @ 939d7096
......@@ -87,6 +87,6 @@
<bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent_level1 = ${@bp_id_agent})"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(c.contract_id = ccc.contract_id AND c.data_class = 'NORMAL' AND ccc.write_off_flag != 'FULL' AND c.contract_status IN ('INCEPT') AND ccc.cf_status = 'RELEASE' AND ccc.cf_direction = 'INFLOW' AND c.pay_method IS NOT NULL AND ccc.cf_item IN (1, 8, 9))"/>
<bm:data-filter name="query" expression="(c.contract_id = ccc.contract_id AND c.data_class = 'NORMAL' AND ccc.write_off_flag != 'FULL' AND c.contract_status IN ('INCEPT') AND ccc.cf_status = 'RELEASE' AND ccc.cf_direction = 'INFLOW' AND c.pay_method IS NOT NULL and (nvl(c.is_include_pealty, 'Y') = 'Y' and ccc.cf_item in (1, 8, 9) or nvl(c.is_include_pealty, 'Y') = 'N' and ccc.cf_item in (1, 8)))"/>
</bm:data-filters>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/cont/CON_AR001/con_contract_account_batch_number.lwm 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-03-03 下午6:29:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
${@account_batch_number}:= con_contract_account_pkg.get_account_batch_number(p_company_id =>${/session/@company_id}, p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="account_batch_number" input="false" output="true" outputPath="@account_batch_number"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_AR001/con_contract_account_cancle.lwm 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-3-4 下午6:29:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
con_contract_account_pkg.contract_account_cancle(p_account_batch_id =>${@account_batch_id},
p_user_id =>${/session/@user_id},
p_company_id =>${/session/@company_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_AR001/con_contract_account_receive.lwm 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
con_contract_account_pkg.account_workflow_start(p_account_batch_id =>${@account_batch_id},
p_company_id=>${/session/@company_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/cont/CON_AR001/contract_account_data_change.lwm 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-03-03 下午6:29:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
con_contract_account_pkg.contract_account_data(p_account_batch_id =>${@account_batch_id},
p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON_AR001/contract_account_data_delete.lwm 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-3-4 下午6:29:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
con_contract_account_pkg.contract_account_data_delete(p_acount_details_id =>${@acount_details_id},
p_contract_id =>${@contract_id},
p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm
View file @ 939d7096
......@@ -146,6 +146,7 @@ end;
due_amount) from con_contract_cashflow where cashflow_id = t1.write_off_cashflow_id)" />
<bm:field name="payment_deduction" expression="(select payment_deduction from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
<bm:field name="division" expression="(select division from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
<bm:field name="is_include_pealty" expression="(select nvl(c.is_include_pealty,'Y') from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/con_account_receivable_query_g_contract_result_queryfields.js 0 → 100644
View file @ 939d7096
var override_queryfields = [
{
name : 'creationdate_from',
queryexpression : "trunc(t1.creationdate) >= to_date(${@creationdate_from},'yyyy-mm-dd')"
},
{
name : 'creationdate_to',
queryexpression : "trunc(t1.creationdate) <= to_date(${@creationdate_to},'yyyy-mm-dd')"
}];
var add_datafilters = [ {
name : 'contract_id',
expression : "not exists (select 1 from con_contract_account_detail ccad where ccad.account_batch_id = t1.account_batch_id and not exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2 where a1.trx_category = 'CONTRACT' and a1.trx_id = ccad.contract_id and trunc(sysdate) between a1.start_date and nvl(a1.end_date, trunc(sysdate)) and a1.user_id = a2.owner_user_id and a1.trx_category = a2.trx_category and a2.authorized_user_id = 1 and trunc(sysdate) between a2.start_date and nvl(a2.end_date, trunc(sysdate))))"
} ];
override();
add_datafilter();
\ No newline at end of file
src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
View file @ 939d7096
......@@ -357,5 +357,7 @@ var enableLayoutConfig = {
'modules/csh/CSH501R/csh_payment_comm_selected.lview':true,
'modules/csh/CSH501R/csh_payment_comm_req.lview':true,
'modules/cont/CON1380/con_commission_report.lview':true,
'modules/hsbc/HSBC120/hsbc_paying_account_change.lview':true
'modules/hsbc/HSBC120/hsbc_paying_account_change.lview':true,
'modules/cont/CON_AR001/contract_accounts_receivable_create.lview':true,
'modules/cont/CON_AR001/contract_accounts_receivable_maintain.lview':true
};
\ No newline at end of file
src/main/webapp/modules/cont/CON301N/con_contract_query_entrance.lview
View file @ 939d7096
......@@ -11,6 +11,7 @@
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
<a:model-query fetchAll="true" model="cont.CON301N.get_employee_type_code" rootPath="user_type_code"/>
<a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/>
</a:init-procedure>
<a:view>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}zj_wfl_approve_history_check"
......@@ -49,6 +50,15 @@
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract');
Leaf.onReady(function() {
//宏菱内部员工可查看合同信息查询功能的新增字段:收款是否包含违约金
if("${/model/employee_info/record/@employee_type_code}" != 'STAFF'){
$('CONTRACT_QUERY_ENTRANCE_G_CONTRACT_RESULT_con_contract_layout_grid_id').hideColumn('is_include_pealty_n');
$('CONTRACT_QUERY_ENTRANCE_G_CONTRACT_RESULT_con_contract_layout_grid_id').hideColumn('is_include_pealty');
if(document.getElementById('CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_IS_INCLUDE_PEALTY')){
document.getElementById('CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_IS_INCLUDE_PEALTY_prompt').style.display = 'none';
document.getElementById('CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_IS_INCLUDE_PEALTY').style.display = 'none';
}
}
//只要经租代理店或者管理人员才可能看到采购单编号
if("${/model/role_info/record/@role_code}"=="0018"||"${/model/role_info/record/@role_code}"=="0019"){
if('${/model/user_type_code/record/@unit_id}'!="2224"){
......
src/main/webapp/modules/cont/CON_AR001/contract_accounts_receivable_create.lview 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025年2月28日9:29:18
$Revision: 1.0
$Purpose:收款方式变更创建
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" dynamiccreateenabled="true" trace="true">
<a:view>
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id"
model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script src="${/request/@context_path}/javascripts/jquery-1.6.4.min.js" type="text/javascript"/>
<a:link id="${/parameter/@layout_code}_contract_account_modify_link"
url="${/request/@context_path}/modules/cont/CON_AR001/contract_accounts_receivable_maintain.lview"/>
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
function open_contract_detail_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING'||record.data.status == 'CANCEL') {
param['function_code'] = 'CON_AR001D';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY';
param['status'] = record.data.status;
} else {
param['function_code'] = 'CON_AR001D';
param['function_usage'] = 'INSERT';
param['maintain_type'] = 'INSERT';
param['status'] = record.data.status;
}
param['account_batch_id'] = record.data.account_batch_id;
param['url_title'] = '收款规则调整维护';
param['winid'] = '${/parameter/@layout_code}_maintain_win_id'
hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}_contract_account_modify_link', ds_id);
}
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_accounts_batch');
var param = {};
param['function_code'] = 'CON_AR001D';
param['maintain_type'] = 'INSERT';
param['url_title'] = '收款规则调整';
param['winid'] = '${/parameter/@layout_code}_create_win_id'
hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}_contract_account_modify_link', ds_id);
};
//超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'record_detail') {
link_function = open_contract_detail_win;
return '<a href="javascript:open_contract_detail_win(\'' + record.ds.id + '\',\'' + record.id + '\');">查看明细</a>';
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON_AR001/contract_accounts_receivable_maintain.lview 0 → 100644
View file @ 939d7096
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025年3月3日17:29:18
$Revision: 1.0
$Purpose:合同收款规则调整新增
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" dynamiccreateenabled="true" trace="true">
<a:view>
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id"
model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="con_contract_account_cancle_link" model="cont.CON_AR001.con_contract_account_cancle"
modelaction="execute"/>
<a:link id="con_contract_account_receive_link" model="cont.CON_AR001.con_contract_account_receive"
modelaction="execute"/>
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
var save_flag=false;
//保存按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var batch_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_accounts_batch');
var detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_account_detail');
if($(detail_ds_id).data.length<1){
$L.showInfoMessage('提示','请维护收款规则信息！')
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
if(!$(batch_ds_id).validate()){
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
var batch_record = $(batch_ds_id).getCurrentRecord();
if (!batch_record.get('account_batch_number')) {
Leaf.request({
url: '${/request/@context_path}/autocrud/cont.CON_AR001.con_contract_account_batch_number/execute',
para: {},
success: function (res) {
var account_batch_number = res.result.account_batch_number;
batch_record.set('account_batch_number', account_batch_number);
save_flag=true;
var root_ds = $('${/parameter/@layout_code}_virtual_ds');
if (root_ds) {
root_ds.submit();
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK']();
},
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 {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var root_ds = $('${/parameter/@layout_code}_virtual_ds');
if (root_ds) {
root_ds.submit();
}
}
};
//提交
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
var batch_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_accounts_batch');
var detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_account_detail');
var batch_record = $(batch_ds_id).getAt(0);
var detail_record = $(detail_ds_id).getAll();
var account_batch_id = batch_record.data.account_batch_id
if (!account_batch_id) {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存再提交数据！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
if($(detail_ds_id).data.length<1){
$L.showInfoMessage('提示','请维护收款规则信息！')
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
for (var i = 0; i < detail_record.length; i++) {
if(detail_record[i].get('is_include_pealty_before')==detail_record[i].get('is_include_pealty')){
Leaf.showMessage('${l:HLS.PROMPT}', '存在合同的收款规则未调整，请重新选择！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
if (detail_record[i].dirty) {
Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
}
Leaf.request({
url: $('con_contract_account_receive_link').getUrl(),
para: {
account_batch_id: account_batch_id
},
success: function (res) {
Leaf.SideBar.show({
msg: '操作成功',
duration: 2000
});
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
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
});
};
//取消
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var batch_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_accounts_batch');
var batch_record = $(batch_ds_id).getCurrentRecord();
$L.showConfirm('提示','确认取消该批次的修改信息?',function () {
Leaf.request({
url: $('con_contract_account_cancle_link').getUrl(),
para: {
account_batch_id: batch_record.data.account_batch_id
},
success: function (res) {
Leaf.SideBar.show({
msg: '取消成功',
duration: 2000
});
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
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
});
},function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
})
};
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
var detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_account_detail');
$(detail_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
Leaf.onReady(function () {
if ("${/parameter/@function_usage}" == 'QUERY'){
if(document.getElementById("${/parameter/@layout_code}_user_button1")){
document.getElementById("${/parameter/@layout_code}_user_button1").style.display = "none";
}
if(document.getElementById("${/parameter/@layout_code}_user_button2")){
document.getElementById("${/parameter/@layout_code}_user_button2").style.display = "none";
}
if(document.getElementById("${/parameter/@layout_code}_user_button3")){
document.getElementById("${/parameter/@layout_code}_user_button3").style.display = "none";
}
}
});
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 939d7096
......@@ -847,6 +847,7 @@
var depositRs_date_count=0;
var operatRs_date_count=0;
var interfaceRs_date_count=0;
var interfaceRs_peanlty_count=0;
var transaction_date = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord().get('transaction_date');
var transaction_type = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord().get('transaction_type');
//核销为融租保证金
......@@ -875,11 +876,20 @@
}
}
}
//校验当合同的扣款方式为“电汇”时，合同收款规则不包含罚息核销中含有罚息则提示
for(var k=0;k<interfaceRs.length;k++){
if(interfaceRs[k].get('is_include_pealty')=='N' &&interfaceRs[k].get('write_off_cf_item')=='9'){
interfaceRs_peanlty_count = plus(interfaceRs_peanlty_count, 1);
break;
}
}
var promt;
if(depositRs_date_count>0 ||operatRs_date_count>0){
promt =(transaction_date.getMonth()+1)+'月营业月结未确认,收款日期为'+Leaf.formatDate(transaction_date)+',与当前选择<br/>保证金的核销日期存在跨月,会影响会计凭证日期,确认<br/>要提交吗？'
}else if(interfaceRs_date_count>0){
promt = interfaceRs_date.split('-')[0]+'-'+interfaceRs_date.split('-')[1]+'月营业月结未确认,与当前选择的核销日期存在<br/>跨月，会影响会计凭证日期，确认要提交吗？'
}else if(interfaceRs_peanlty_count>0){
promt = '列表中待核销的现金流和当前合同对应的收款规则不一致，请确认是否核销?'
}else{
promt = '确认提交复核吗?'
}
......
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