Skip to content

L
leaf-hlcm
Commit 921927b6 authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/ifrs9_report' into develop

parents 4c579ffe 80011d2f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 343 additions and 172 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
View file @ 921927b6
......@@ -95,8 +95,6 @@
t1.inv_object_taxpayer_type,
t1.object_taxpayer_type) = 'SMALL_SCALE_TAXPAYER' and
to_char(t2.due_date,'yyyy-mm') <= to_char(SYSDATE,'yyyy-mm')) or t2.write_off_flag = 'FULL')
and ((t2.cf_item = '8' and t2.write_off_flag = 'FULL') or
t2.cf_item <> '8')
AND cf_item<> 9
AND cf_status='RELEASE'
and nvl(t2.billing_status,'NOT') != 'FULL'
......@@ -195,9 +193,13 @@
from acr_invoice_contract_v t1, acr_invoice_penalty_v t2
where
t2.contract_id=t1.contract_id
and not exists (select 1
from acr_invoice_ln l
where l.ref_n03=t2.journal_header_id)
AND (NOT EXISTS (SELECT 1
FROM acr_invoice_ln l
WHERE l.ref_n04 = t2.journal_line_id
GROUP BY journal_line_id
HAVING SUM(l.total_amount)>0 )
)
)vv
#WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/cont/CON3500/contract_ifrs9_report_flag.lwm 0 → 100644
View file @ 921927b6
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select
csh_write_off_pkg.update_ifrs9_col_flag(
p_period_name =>${/parameter/@period_name},
p_user_id =>${/session/@user_id} ) flag
from dual
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="period_name" queryExpression="t1.period_day=${@period_name}"/>
<!-- <bm:query-field name="journal_date_to" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &lt;= ${@journal_date_to}"/>-->
<!-- <bm:query-field name="bp_id_agent_level1" queryExpression="t.bp_id_agent_level1=${@bp_id_agent_level1}"/>-->
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON3500/contract_ifrs9_report_temp.lwm
View file @ 921927b6
......@@ -16,7 +16,10 @@
(csh_write_off_pkg.get_overdue_day(p_contract_id => t1.ref_contract_id,
p_calc_date => t1.base_date,
p_user_id => 1))OVERDUE_MAX_DAYS,
t1.rest_amount RESIDUAL_CLAIMS,
nvl(( con_cashflow_monthly_pkg.get_unwrite_amount_column(p_session_id => -1,
p_due_date => t1.base_date,
p_contract_id =>t1.ref_contract_id )),0) RESIDUAL_CLAIMS,
t1.pay_date PAYDATE_1,
t1.pay_amount RESIDUAL_VALUE,
t1.industry_belonged INDUSTRY,
......@@ -38,11 +41,23 @@
<bm:update-sql><![CDATA[
begin
csh_write_off_pkg.update_ifrs9_col(
p_period_name =>${@period_name}
p_period_name =>${@period_name},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
select
csh_write_off_pkg.update_ifrs9_col_flag(
p_period_name =>${@period_name},
p_user_id =>${/session/@user_id} ) flag
from dual
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="period_name" queryExpression="t1.period_day=${@period_name}"/>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/contract_sales_entrance_ac_g_contract_result_queryfields.js
View file @ 921927b6
......@@ -6,6 +6,10 @@ var override_queryfields = [
{
name : 'journal_date_to',
queryexpression : "to_char(t1.journal_date,'yyyy-mm-dd') <=${@journal_date_to} "
},{
name : 'bp_id_agent_level1',
queryexpression : "t1.bp_id_agent_level1=${@bp_id_agent_level1}"
}
];
......
src/main/webapp/modules/cont/CON3300/contract_item_query_report.lview
View file @ 921927b6
......@@ -32,14 +32,15 @@
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'GENERAL');
var record=$(ds_id).getAt(0);
if(record.get('due_date_from')&&record.get('due_date_to')){
if(record.get('due_date_from')&&record.get('due_date_to')&&record.get('base_date')){
var ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
$(ds).setQueryUrl("${/request/@context_path}/autocrud/cont.CON3300.contract_item_report_query/query");
$(ds).setQueryParameter('due_date_from',record.get('due_date_from'));
$(ds).setQueryParameter('due_date_to',record.get('due_date_to'));
$(ds).setQueryParameter('base_date',record.get('base_date'));
$(ds).query();
}else{
$L.showInfoMessage("提示",'请输入字段：预定收款日从、预定收款日到!');
$L.showInfoMessage("提示",'请输入字段：租赁开始日从、租赁开始日到、基准日!');
}
}
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @ 921927b6
......@@ -8,6 +8,11 @@
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<style>
body{
font-size: 12px;
}
</style>
<script type="text/javascript"><![CDATA[
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_tabcode_basetable(
......@@ -21,7 +26,19 @@
param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY';
param['url_title'] = 'IFRS9';
hls_doc_get_layout_code('contract_get_layout_code_link_id', param, 'con_contract_ifrs9_link',ds_id);
param['winid']='ifrs9_win';
var win = new Leaf.Window({
id: 'ifrs9_win',
url: $('con_contract_ifrs9_link').getUrl(),
params: param,
title: '发送信息',
fullScreen: true
});
win.on('close', function () {
document.getElementsByClassName('alert')[0].remove();
});
// hls_doc_get_layout_code('contract_get_layout_code_link_id', param, 'con_contract_ifrs9_link',ds_id);
}
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
View file @ 921927b6
<?xml version="1.0" encoding="UTF-8"?>
<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 model="cont.CON3500.contract_ifrs9_report_flag" rootPath="status"/>
</a:init-procedure>
<a:view>
<link href="${/request/@context_path}/lib/bootstrap-3.3.7/css/bootstrap.css" rel="stylesheet" type="text/css"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="save_ifrs9_report_link" model="cont.CON3500.contract_ifrs9_report_temp"
modelaction="update"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<style>
body{
font-size: 12px;
}
</style>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
//检查保存按钮
var flag='${/model/status/record/@flag}';
if(flag=='Y'){
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
}else{
var reminder=document.getElementsByClassName('screenTopToolbar');
for(var i=0;i<reminder.length;i=i+1){
var t=reminder[i];
t.insertAdjacentHTML('afterend', '<div class="alert alert-danger" role="alert" >数据只能保存一次，请确认后保存</div>');
}
}
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
$(ds_id).setQueryParameter("period_name",'${/parameter/@period_name}');
$(ds_id).query();
......@@ -23,6 +46,7 @@
$(ds_id).setQueryParameter('period_name','${/parameter/@period_name}');
$(ds_id).query();
}
//保存数据
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var period_name="${/parameter/@period_name}";
......@@ -33,6 +57,8 @@
period_name:period_name
},
success: function() {
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
Leaf.SideBar.show({
msg: '保存成功',
duration: 2000
......@@ -51,5 +77,6 @@
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/gld/GLD107/gld_je_template_lines.lview
View file @ 921927b6
......@@ -334,7 +334,7 @@
return '<a href="javascript:winOpen_templateLineCopy('+ record.get('je_template_ln_id') + ',' + record.get('je_ln_number') + ');">' + '复制' + '</a>';
}
]]></script>
<a:tabPanel marginHeight="100" marginWidth="30">
<a:tabPanel marginHeight="50" marginWidth="30">
<a:tabs>
<a:tab prompt="GLD107.TAB.BASIC_INFO" width="100">
<a:grid id="lineDs_basic_grid" bindTarget="lineDs" marginHeight="50" marginWidth="60" height="500">
......@@ -358,7 +358,7 @@
</a:grid>
</a:tab>
<a:tab prompt="GLD107.TAB.REF_INFO" width="100">
<a:grid id="lineDs_ref_grid" bindTarget="lineDs" marginHeight="300" marginWidth="60" height="500">
<a:grid id="lineDs_ref_grid" bindTarget="lineDs" marginHeight="50" marginWidth="60">
<a:columns>
<a:column name="je_ln_number" align="right" editor="lineDs_ref_grid_nf_integer" width="50"/>
<a:column name="ref_1_config" editorFunction="editorFunction_lineDs_ref_grid_advanceConfig" width="150"/>
......@@ -392,7 +392,7 @@
</a:grid>
</a:tab>
<a:tab prompt="GLD107.TAB.ADDITIONAL_INFO" width="100">
<a:grid id="lineDs_additional_grid" bindTarget="lineDs" marginHeight="300" marginWidth="60" height="500">
<a:grid id="lineDs_additional_grid" bindTarget="lineDs" marginHeight="50" marginWidth="60" height="500">
<a:columns>
<a:column name="je_ln_number" align="right" editor="lineDs_additional_grid_nf_integer" width="50"/>
<a:column name="amount_fuc_config" editorFunction="editorFunction_lineDs_additional_grid_advanceConfig" width="250"/>
......
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