Skip to content

L
leaf-hlcm
Commit 8ead9284 authored by stone's avatar stone
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

parents e2d04fff 5c063124
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1156 additions and 2086 deletions
src/main/database/Package/cus_con_deposit_pkg.pck
View file @ 8ead9284
......@@ -218,6 +218,22 @@ create or replace package body cus_con_deposit_pkg is
values v_deposit_calc_overdue_tmp_rec;
end if;
end if;
--计算penalty
if p_contract_cashflow_rec.write_off_flag <> 'FULL' then
calc_penalty(p_cashflow_rec => p_contract_cashflow_rec,
p_contract_rec => p_contract_rec,
p_calc_date => p_calc_date,
p_total_penalty_amt => v_total_penalty_amt,
p_user_id => p_user_id);
--会计逾期金额默认营业数据，当会计没核销实际上和营业逾期一致
update CUS_DEPOSIT_CALC_OVERDUE_TMP
set OVERDUE_PENALTY_AMT = v_total_penalty_amt,
f_overdue_amount = overdue_amount,
f_overdue_penalty_amt = v_total_penalty_amt
where calc_id = v_deposit_calc_overdue_tmp_rec.calc_id;
end if;
--计算会计逾期数据,取会计核销的最大期与营业现金流数据比较
for c_f in (select gwo.cf_item,
gwo.times,
......@@ -225,14 +241,14 @@ create or replace package body cus_con_deposit_pkg is
gwo.penalty_calc_date
from GLD_WRITE_OFF gwo
where /*gwo.create_je_flag = 'Y'
AND */
AND */
gwo.reversed_flag = 'N'
and gwo.contract_id = p_contract_rec.contract_id
and gwo.times =
(select max(gwo.times) max_times
from GLD_WRITE_OFF gwo
where /*gwo.create_je_flag = 'Y'
AND */
AND */
gwo.reversed_flag = 'N'
and gwo.contract_id = p_contract_rec.contract_id)
group by gwo.cf_item, gwo.times, gwo.penalty_calc_date) loop
......@@ -287,18 +303,6 @@ create or replace package body cus_con_deposit_pkg is
and t.session_id = p_session_id;
end if;
end loop;
--计算penalty
if p_contract_cashflow_rec.write_off_flag <> 'FULL' then
calc_penalty(p_cashflow_rec => p_contract_cashflow_rec,
p_contract_rec => p_contract_rec,
p_calc_date => p_calc_date,
p_total_penalty_amt => v_total_penalty_amt,
p_user_id => p_user_id);
update CUS_DEPOSIT_CALC_OVERDUE_TMP
set OVERDUE_PENALTY_AMT = v_total_penalty_amt
where calc_id = v_deposit_calc_overdue_tmp_rec.calc_id;
end if;
end;
procedure overdue_dayend(p_contract_id number,
......
src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm
View file @ 8ead9284
......@@ -36,6 +36,9 @@
<bm:field name="lease_organization_desc" expression="(select description from hls_lease_organization where lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/>
<!--<bm:field name="owner_user_id_n" expression="(select description from sys_user where user_id = t1.created_by)" forInsert="false" forUpdate="false"/>-->
<bm:field name="is_terminate" expression="(CASE WHEN ((select sum(ccc.due_amount) from con_contract_cashflow ccc where contract_id = t1.contract_id and cf_item=1) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where contract_id = t1.contract_id and cf_item=1)) = 0 THEN &apos;是&apos; ELSE &apos;否&apos; END)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_agent_desc"/>
<bm:field name="business_type_n"/>
<bm:field name="division_n"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -52,9 +55,10 @@
<bm:query-field field="owner_user_id" queryOperator="="/>
<bm:query-field field="bp_id_tenant" queryOperator="="/>
<bm:query-field field="lease_organization" queryOperator="="/>
<bm:query-field field="bp_id_agent_desc" queryExpression="bp_id_agent_desc like upper(&apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;)"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_status in (&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;ADING&apos;) "/>
<bm:data-filter enforceOperations="query" expression="t1.contract_status in (&apos;TERMINATE&apos;) "/>
<!-- <bm:data-filter enforceOperations="query" expression="t1.lease_end_date &lt;= sysdate"/> -->
<bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
<!--<bm:data-filter enforceOperations="query" expression=" NOT EXISTS (SELECT 1 FROM con_contract_cashflow WHERE contract_id = t1.contract_id AND cf_item IN (1,8,52) AND (write_off_flag IN (&apos;PARTIAL&apos;, &apos;NOT&apos;) OR received_amount != due_amount))"/>-->
......
src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview 0 → 100644
View file @ 8ead9284
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lpc 9874
$Date:
$Revision: 1.0
$Purpose: 租赁物查看
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
]]></s:server-script>
</a:init-procedure>
<a:view>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<a:link id="contract_accounting_wait_link_id" model="cont.CON505N.contract_accounting_wait" modelaction="update"/>
<a:link id="contract_accounting_finish_link_id" model="cont.CON505N.contract_accounting_finish" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Ext.ux.Lightbox.register('a[ref=img]', true);
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var con_accounting_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage');
var accounting_record = $(con_accounting_ds_id).getCurrentRecord();
$('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').setQueryParameter('con_accounting_id', accounting_record.get('con_accounting_id'));
$('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').query();
};
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
};
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
};
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {};
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {};
function view_pdf(attachment_id) {
Leaf.request({
url: '${/request/@context_path}/autocrud/fnd.fnd_atm_attachment/query',
para: {
attachment_id: attachment_id
},
success: function(res) {
var path = res.result.record.file_path;
path = path.substr(path.indexOf('hls_attachment'));
var tomcat_source = '${/parameter/@tomcat_source}';
var source_path = 'http://' + window.location.host + '/' + tomcat_source + '/' + path;
var oWin = window.open(source_path);
},
scope: this
});
}
function upload_file(id, name, query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
if (record.get('con_accounting_attch_id')) {
var url;
if (query_only == 'Y') {
url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=CON_ACCOUNTING_MANAGE_ATTCH&header_id=' + record.get('con_accounting_attch_id');
} else {
url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=CON_ACCOUNTING_MANAGE_ATTCH&header_id=' + record.get('con_accounting_attch_id');
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'prj500_cdd_uploadFile_screen_id',
width: 850,
height: 400
});
win.on('close', function() {
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_id', record.get('con_accounting_id'));
// $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_attch_id', record.get('con_accounting_attch_id'));
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').query();
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
}
};
//超链接渲染
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'attachment') {
link_function = 'upload_file';
if (record.get('attach_count') == 0 || !record.get('attach_count')) {
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else {
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '(' + record.get('attach_count') + ')' + '</a>';
}
} else if (name == 'attach_file_name') {
//
if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;');
var url = '';
for (var i = 0;i < str.length;i++) {
var temp = str[i].split('--');
if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
}
}
}
return url;
}
}
};
]]></script>
</a:view>
</a:screen>
src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
View file @ 8ead9284
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/zjwfl/zj_wfl_approve_history.lview
View file @ 8ead9284
......@@ -120,8 +120,8 @@
<a:columns>
<a:column name="create_date_fmt" prompt="审批时间" width="150"/>
<a:column name="action_type_desc" prompt="审批操作" renderer="render_action_type_desc" width="200"/>
<!-- <a:column name="comment_text" prompt="内部信审意见" width="250"/> -->
<a:column name="comment_text_out" prompt="审批意见" width="400"/>
<a:column name="comment_text" prompt="审批意见" width="250"/>
<!--<a:column name="comment_text_out" prompt="审批意见" width="400"/>-->
<a:column name="node_desc" prompt="审批节点" width="200"/>
<a:column name="approver" prompt="审批人" renderer="check_agent_renderer" width="200"/>
<a:placeHolder id="dynamicLineColumn_id"/>
......
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