Skip to content

L
leaf-hlcm
Commit 1f64c16b authored by liyuan.chen's avatar liyuan.chen
Browse files
Options

买断机修改，债权月报修改，同意导入修改

parent 3f2098df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 480 additions and 347 deletions
src/main/webapp/WEB-INF/classes/cont/CON3600/contract_lease_report.lwm
View file @ 1f64c16b
......@@ -23,7 +23,11 @@
AND cwo.cf_item IN (1, 200, 250)
AND nvl(cwo.reversed_flag, 'N') = 'N'
AND trunc(ct.transaction_date) <=
trunc(to_date(${@last_month_date}, 'yyyy-mm-dd'))),
trunc(to_date(${@last_month_date}, 'yyyy-mm-dd'))
and exists(select 1
from con_contract_cashflow cc
where cc.CASHFLOW_ID = cwo.CASHFLOW_ID
and cc.CF_STATUS = 'RELEASE')),
0)
ELSE
0
......@@ -219,7 +223,12 @@
AND cwo.csh_transaction_id = ct.transaction_id
AND nvl(cwo.reversed_flag, 'N') = 'N'
AND trunc(ct.transaction_date) <=
TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))),
TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))
and exists(select 1
from con_contract_cashflow cc
where cc.CASHFLOW_ID = cwo.CASHFLOW_ID
and cc.CF_STATUS = 'RELEASE')
),
0) rest_unpayment_amount,
--保证金后
contract_item_query_pkg.calc_rest_rent_by_dudt(p_contract_id => t.contract_id,
......@@ -369,7 +378,14 @@
where v.CODE = 'CON500_CONTRACT_STATUS'
and v.CODE_VALUE = t.CONTRACT_STATUS
and v.CODE_ENABLED_FLAG = 'Y'
and v.CODE_VALUE_ENABLED_FLAG = 'Y') contract_status_n
and v.CODE_VALUE_ENABLED_FLAG = 'Y') contract_status_n,
t.is_buyout,
(Select v1.code_value_name
From sys_code_values_v v1
Where v1.code = 'YES_OR_NO'
And v1.code_enabled_flag = 'Y'
And v1.code_value_enabled_flag = 'Y'
and v1.CODE_VALUE = t.is_buyout) is_buyout_n
FROM con_contract t, hls_bp_master h
WHERE t.data_class = 'NORMAL'
AND t.bp_id_agent_level1 = h.bp_id
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 1f64c16b
......@@ -78,7 +78,7 @@
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID').style.display = 'block';
} else if (record.get('secondary_lease') == 'NO') {
} else /*if (record.get('secondary_lease') == 'NO') */{
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_REPUR_CONTRACT_ID').style.display = 'none';
}
......
src/main/webapp/modules/rpt/RPT5012/rpt5012_repory_query.lview
View file @ 1f64c16b
......@@ -29,6 +29,7 @@
<a:column name="bp_tenant_name" align="center" prompt="客户名称" width="120"/>
<a:column name="contract_number" align="center" prompt="合同编号" width="100"/>
<a:column name="lease_start_date" align="center" prompt="租赁期开始日" width="80"/>
<a:column name="is_buyout_n" align="center" prompt="是否买断机" width="100"/>
<a:column name="modelcd" align="center" prompt=" 机型" width="180"/>
<a:column name="machine_number" align="center" prompt="机器号码" width="80"/>
<a:column name="int_rate_display" align="center" prompt="利率" width="80"/>
......@@ -59,6 +60,7 @@
<a:column name="bp_tenant_name" align="center" prompt="客户名称" width="120"/>
<a:column name="contract_number" align="center" prompt="合同编号" width="100"/>
<a:column name="lease_start_date" align="center" prompt="租赁期开始日" width="80"/>
<a:column name="is_buyout_n" align="center" prompt="是否买断机" width="100"/>
<a:column name="modelcd" align="center" prompt=" 机型" width="180"/>
<a:column name="machine_number" align="center" prompt="机器号码" width="80"/>
<a:column name="int_rate_display" align="center" prompt="利率" width="80"/>
......
src/main/webapp/modules/sys/SYS999/general_dynamic_grid.lview
View file @ 1f64c16b
......@@ -4,7 +4,7 @@
<a:model-query fetchAll="true" model="sys.SYS999.fnd_transfer_table" rootPath="gerneral_cols"/>
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
<script><![CDATA[
/* window['${/parameter/@sheet_name}_indexchange_fun'] = function(ds,record){
var line_id = record.get('line_id');
$('general_error_mes_ds').setQueryParameter('line_id',line_id);
......
src/main/webapp/modules/sys/SYS999/general_excel_execute.lview
View file @ 1f64c16b
......@@ -8,8 +8,8 @@
</a:init-procedure>
<a:view>
<a:link id="import_detail_link" url="${/request/@context_path}/modules/sys/SYS999/general_import_detail.lview"/>
<script type="text/javascript"><![CDATA[
Leaf.post($('import_detail_link').getUrl()+'?header_id=${/parameter/@header_id}');
<script><![CDATA[
Leaf.post($('import_detail_link').getUrl()+'?header_id=${/parameter/@header_id}&_csrf=${/session/@_csrf.token}');
]]></script>
</a:view>
</a:screen>
src/main/webapp/modules/sys/SYS999/general_import_detail.lview
View file @ 1f64c16b
......@@ -7,7 +7,7 @@
<a:view>
<a:link id="general_confirm" model="sys.SYS999.main" modelaction="execute"/>
<a:link id="general_import_upload_link" url="${/request/@context_path}/modules/sys/SYS999/general_upload.lview"/>
<script type="text/javascript"><![CDATA[
<script><![CDATA[
var general_ds_list = []; //用于存放所有被加载的ds_id
function load_all_ds_list() {//加载所有的已打开的tab_ds
......@@ -81,8 +81,25 @@
$(ds_id).submit();
}
}
function display_query(){
var err_flag= $('sy999_query_ds').getAt(0).get('err_flag');
for (var i = 0;i < general_ds_list.length;i++) {
var ds_id = general_ds_list[i].ds_id;
if (err_flag =='Y'){
$(ds_id).setQueryParameter('err_flag',err_flag);
}else{
$(ds_id).setQueryParameter('err_flag',null);
}
$(ds_id).query();
}
}
]]></script>
<a:dataSets>
<a:dataSet id="sy999_query_ds" autoCreate="true">
<a:fields>
<a:field name="err_flag" checkedValue="Y" uncheckedValue="N"/>
</a:fields>
</a:dataSet>
<a:dataSet id="general_error_mes_ds" model="sys.SYS999.fnd_interface_log"/>
</a:dataSets>
<a:screenBody>
......@@ -92,6 +109,13 @@
<a:gridButton click="general_save" text="保存"/>
<a:gridButton click="general_execute" text="确认数据"/>
</a:screenTopToolbar>
<a:hBox>
<a:checkBox name="err_flag" bindTarget="sy999_query_ds" prompt="只显示错误">
<a:events>
<a:event name="change" handler="display_query"/>
</a:events>
</a:checkBox>
</a:hBox>
<a:tabPanel id="general_detail_tabpanel_id" marginHeight="300" marginWidth="50">
<a:tabs>
<a:placeHolder id="dynamic_tab"/>
......
src/main/webapp/modules/sys/SYS999/general_upload.lview
View file @ 1f64c16b
......@@ -3,7 +3,7 @@
<a:init-procedure/>
<a:view>
<a:link id="general_upload_excel_control_link" url="${/request/@context_path}/modules/sys/SYS999/general_excel_execute.lview"/>
<script type="text/javascript"><![CDATA[
<script><![CDATA[
function saveClick() {
if (document.getElementById('general_importFile').value) {
var fileName = document.getElementById('general_importFile').value;
......@@ -11,6 +11,8 @@
if (fileType != '.xls' && fileType != '.xlsx') {
alert('请选择正确的导入文件！');
} else {
var detail_mask = $('upload_window').wrap;
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
document.getElementById('general_importForm').submit();
}
}
......@@ -34,7 +36,7 @@
<a:label name="label6" bindTarget="csh713_label_ds" style="margin-left:10px;" width="380"/>
</a:fieldSet>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入文件" width="400">
<form name="upload" id="general_importForm" action="general_excel_execute.lview" enctype="multipart/form-data" method="post">
<form name="upload" id="general_importForm" action="general_excel_execute.lview?_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post">
<input name="CONTENT" id="general_importFile" style="margin-bottom:4px;width:250px;height:22px;" type="file"/>
<input onclick="saveClick()" style="margin-left:10px;margin-top:10px;width:60px;" type="button" value="导入"/>
</form>
......
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