Skip to content

L
leaf-hlcm
Commit e6b65a17 authored by lizhe's avatar lizhe
Browse files
Options

佣金资管报表合并调整

parent 6e5136f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 214 deletions
src/main/webapp/WEB-INF/classes/rpt/RPT7100/get_period_name.lwm
View file @ e6b65a17
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:fields>
<bm:field name="period_name" forQuery="true" forDisplay="true" physicalName="period_name" prompt="期间"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT T1.PERIOD_NAME period_name
FROM GLD_PERIOD_STATUS_V t1
WHERE company_id =1
AND adjustment_flag = 'N'
--AND T1.END_DATE<=SYSDATE
ORDER BY start_date DESC
select* from( select p.period_name
from gld_periods p
where p.period_set_code = 'STD_PERIOD' and p.adjustment_flag= 'N' and p.period_name>'2015-13'
order by p.internal_period_num)t #WHERE_CLAUSE#
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="period_name" queryExpression="t.period_name like &apos;%&apos;||${@period_name}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/rpt/RPT7100/rpt_asset_commission_split.lview
View file @ e6b65a17
......@@ -21,6 +21,10 @@
<script type="text/javascript"><![CDATA[
function rpt7100_asset_commission_split_query() {
if(Ext.isEmpty($('rpt_rpt7100_query_ds').getCurrentRecord().get('period_name_from'))){
Leaf.showMessage('提示', '请选择“期间从”进行查询');
return;
}
$('asset_commission_split_ds').query();
}
......@@ -34,14 +38,14 @@
function asset_link(value, record, name) {
if (name == 'sum_asset_not_due_amount') {
if (name == 'sum_asset_due_amount' && !Ext.isEmpty(value)) {
return '<a href="javascript:asset_contract_number_link(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}
}
function asset_contract_number_link(ds_id, id) {
console.log(ds_id);
console.log(id);
// console.log(ds_id);
// console.log(id);
var loan_contract_ds_id = 'asset_commission_split_ds';
var record = $(loan_contract_ds_id).findById(id);
var param = {};
......@@ -64,13 +68,23 @@
<a:field name="contract_number"/>
<a:field name="bp_name"/>
<a:field name="agent_name"/>
<a:field name="period_name_from" displayField="period_name" options="rpt7100_period_name_ds"
returnField="period_name_from" valueField="period_name"/>
<a:field name="period_name_to" displayField="period_name" options="rpt7100_period_name_ds"
returnField="period_name_to" valueField="period_name"/>
<!-- <a:field name="period_name_from" displayField="period_name" options="rpt7100_period_name_ds"-->
<!-- returnField="period_name_from" valueField="period_name" required="true"/>-->
<!-- <a:field name="period_name_to" displayField="period_name" options="rpt7100_period_name_ds"-->
<!-- returnField="period_name_to" valueField="period_name"/>-->
<a:field name="period_name_from" required="true" lovGridHeight="300" lovHeight="500" lovService="rpt.RPT7100.get_period_name" lovWidth="500" title="GLD_PERIODS.PERIOD_NAME">
<a:mapping>
<a:map from="period_name" to="period_name_from"/>
</a:mapping>
</a:field>
<a:field name="period_name_to" lovGridHeight="300" lovHeight="500" lovService="rpt.RPT7100.get_period_name" lovWidth="500" title="GLD_PERIODS.PERIOD_NAME">
<a:mapping>
<a:map from="period_name" to="period_name_to"/>
</a:mapping>
</a:field>
</a:fields>
</a:dataSet>
<a:dataSet id="asset_commission_split_ds" autoQuery="true" pageSize="10"
<a:dataSet id="asset_commission_split_ds" autoQuery="false" autoPageSize="true"
queryUrl="${/request/@context_path}/autocrud/rpt.RPT7100.rpt_asset_commission_split/query"
queryDataSet="rpt_rpt7100_query_ds">
......@@ -88,14 +102,14 @@
<a:textField name="contract_number" bindTarget="rpt_rpt7100_query_ds"
prompt="合同编号"/>
<a:textField name="bp_name" bindTarget="rpt_rpt7100_query_ds" prompt="承租人"/>
<a:comboBox name="period_name_from" bindTarget="rpt_rpt7100_query_ds" prompt="期间从"/>
<a:comboBox name="period_name_to" bindTarget="rpt_rpt7100_query_ds" prompt="期间到"/>
<a:lov name="period_name_from" bindTarget="rpt_rpt7100_query_ds" prompt="期间从"/>
<a:lov name="period_name_to" bindTarget="rpt_rpt7100_query_ds" prompt="期间到"/>
<a:textField name="agent_name" bindTarget="rpt_rpt7100_query_ds" prompt="代理店简称"/>
</a:form>
<a:grid id="asset_commission_split_id" bindTarget="asset_commission_split_ds" marginHeight="170"
marginWidth="30" navBar="true">
<a:columns>
<a:column name="times" align="center" prompt="期数" width="130"/>
<!-- <a:column name="times" align="center" prompt="期数" width="130"/>-->
<a:column name="contract_number" align="center" prompt="合同编号" width="130"/>
<a:column name="bp_code" align="center" prompt="承租人编号" width="130"/>
<a:column name="bp_name" align="center" prompt="承租人" width="130"/>
......@@ -104,7 +118,7 @@
<a:column name="division_desc" align="center" prompt="租赁物" width="130"/>
<a:column name="interest" align="center" prompt="合同利息总额" width="130"/>
<a:column name="received_interest" align="center" prompt="已核销利息总额" width="130"/>
<a:column name="internal_period_num" align="center" prompt="期间" width="130"/>
<a:column name="period_name" align="center" prompt="期间" width="130"/>
<a:column name="income_tax_amount" align="center" prompt="当期可列支佣金(不含税)" width="200"/>
<a:column name="income_tax_diff_amount" align="center" prompt="当期不可列支佣金(不含税)" width="200"/>
<a:column name="asset_not_due_amount" align="center" prompt="当期资产管理费(不含税)" width="200"/>
......@@ -114,8 +128,8 @@
<a:column name="commission_due_amount" align="center" prompt="含税佣金" width="130"/>
<a:column name="commission_due_date" align="center" prompt="佣金支付日期" width="130"/>
<a:column name="commission_invoice_number" align="center" prompt="佣金发票号码" width="130"/>
<a:column name="sum_asset_due_amount" align="center" prompt="不含税资产管理费" width="130"/>
<a:column name="sum_asset_not_due_amount" align="center" prompt="含税资产管理费" width="130"
<a:column name="sum_asset_not_due_amount" align="center" prompt="不含税资产管理费" width="130"/>
<a:column name="sum_asset_due_amount" align="center" prompt="含税资产管理费" width="130"
renderer="asset_link"/>
</a:columns>
</a:grid>
......
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