Commit 6e143b15 authored by chenzhuo's avatar chenzhuo

新增报单70期调整

parent e1c6fc80
...@@ -78,6 +78,16 @@ ...@@ -78,6 +78,16 @@
t.not_due_amount_58, t.not_due_amount_58,
t.not_due_amount_59, t.not_due_amount_59,
t.not_due_amount_60, t.not_due_amount_60,
t.not_due_amount_61,
t.not_due_amount_62,
t.not_due_amount_63,
t.not_due_amount_64,
t.not_due_amount_65,
t.not_due_amount_66,
t.not_due_amount_67,
t.not_due_amount_68,
t.not_due_amount_69,
t.not_due_amount_70,
t.not_due_amount_48_left, t.not_due_amount_48_left,
t.not_due_amount_year_1, t.not_due_amount_year_1,
t.not_due_amount_year_2, t.not_due_amount_year_2,
...@@ -183,6 +193,16 @@ ...@@ -183,6 +193,16 @@
tt.not_due_amount_58, tt.not_due_amount_58,
tt.not_due_amount_59, tt.not_due_amount_59,
tt.not_due_amount_60, tt.not_due_amount_60,
tt.not_due_amount_61,
tt.not_due_amount_62,
tt.not_due_amount_63,
tt.not_due_amount_64,
tt.not_due_amount_65,
tt.not_due_amount_66,
tt.not_due_amount_67,
tt.not_due_amount_68,
tt.not_due_amount_69,
tt.not_due_amount_70,
tt.not_due_amount_48_left, tt.not_due_amount_48_left,
tt.not_due_amount_year_1, tt.not_due_amount_year_1,
tt.not_due_amount_year_2, tt.not_due_amount_year_2,
...@@ -282,6 +302,16 @@ ...@@ -282,6 +302,16 @@
sum(nvl(t.not_due_amount_58, 0)) not_due_amount_58, sum(nvl(t.not_due_amount_58, 0)) not_due_amount_58,
sum(nvl(t.not_due_amount_59, 0)) not_due_amount_59, sum(nvl(t.not_due_amount_59, 0)) not_due_amount_59,
sum(nvl(t.not_due_amount_60, 0)) not_due_amount_60, sum(nvl(t.not_due_amount_60, 0)) not_due_amount_60,
sum(nvl(t.not_due_amount_61, 0)) not_due_amount_61,
sum(nvl(t.not_due_amount_62, 0)) not_due_amount_62,
sum(nvl(t.not_due_amount_63, 0)) not_due_amount_63,
sum(nvl(t.not_due_amount_64, 0)) not_due_amount_64,
sum(nvl(t.not_due_amount_65, 0)) not_due_amount_65,
sum(nvl(t.not_due_amount_66, 0)) not_due_amount_66,
sum(nvl(t.not_due_amount_67, 0)) not_due_amount_67,
sum(nvl(t.not_due_amount_68, 0)) not_due_amount_68,
sum(nvl(t.not_due_amount_69, 0)) not_due_amount_69,
sum(nvl(t.not_due_amount_70, 0)) not_due_amount_70,
sum(nvl(t.not_due_amount_48_left, 0)) not_due_amount_48_left, sum(nvl(t.not_due_amount_48_left, 0)) not_due_amount_48_left,
sum(nvl(t.not_due_amount_year_1, 0)) not_due_amount_year_1, sum(nvl(t.not_due_amount_year_1, 0)) not_due_amount_year_1,
sum(nvl(t.not_due_amount_year_2, 0)) not_due_amount_year_2, sum(nvl(t.not_due_amount_year_2, 0)) not_due_amount_year_2,
...@@ -405,6 +435,16 @@ ...@@ -405,6 +435,16 @@
<bm:field name="not_due_amount_58"/> <bm:field name="not_due_amount_58"/>
<bm:field name="not_due_amount_59"/> <bm:field name="not_due_amount_59"/>
<bm:field name="not_due_amount_60"/> <bm:field name="not_due_amount_60"/>
<bm:field name="not_due_amount_61"/>
<bm:field name="not_due_amount_62"/>
<bm:field name="not_due_amount_63"/>
<bm:field name="not_due_amount_64"/>
<bm:field name="not_due_amount_65"/>
<bm:field name="not_due_amount_66"/>
<bm:field name="not_due_amount_67"/>
<bm:field name="not_due_amount_68"/>
<bm:field name="not_due_amount_69"/>
<bm:field name="not_due_amount_70"/>
<bm:field name="not_due_amount_48_left"/> <bm:field name="not_due_amount_48_left"/>
<bm:field name="not_due_amount_year_1"/> <bm:field name="not_due_amount_year_1"/>
<bm:field name="not_due_amount_year_2"/> <bm:field name="not_due_amount_year_2"/>
......
...@@ -98,18 +98,18 @@ ...@@ -98,18 +98,18 @@
<a:form bindTarget="con_contract_cashflow_balance_query_ds" column="4" title="收付款预定查询" marginWidth="40"> <a:form bindTarget="con_contract_cashflow_balance_query_ds" column="4" title="收付款预定查询" marginWidth="40">
<a:datePicker name="due_date" bindTarget="con_contract_cashflow_monthly_query_ds"/> <a:datePicker name="due_date" bindTarget="con_contract_cashflow_monthly_query_ds"/>
<a:comboBox name="business_type_desc" bindTarget="con_contract_cashflow_monthly_query_ds"/> <a:comboBox name="business_type_desc" bindTarget="con_contract_cashflow_monthly_query_ds"/>
<!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>--> <!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>-->
<!-- <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="overdue_day3" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="overdue_day3" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday3" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday3" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday4" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday4" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday5" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday5" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="not_overday6" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>--> <!-- <a:numberField name="not_overday6" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:comboBox name="account_name" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="科目"/>--> <!-- <a:comboBox name="account_name" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="科目"/>-->
</a:form> </a:form>
<a:tabPanel marginHeight="115" marginWidth="40"> <a:tabPanel marginHeight="115" marginWidth="40">
<a:tabs> <a:tabs>
...@@ -195,7 +195,17 @@ ...@@ -195,7 +195,17 @@
<a:column name="not_due_amount_58" align="center" prompt="未到期58个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_58" align="center" prompt="未到期58个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_59" align="center" prompt="未到期59个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_59" align="center" prompt="未到期59个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_60" align="center" prompt="未到期60个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_60" align="center" prompt="未到期60个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_61" align="center" prompt="未到期61个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_62" align="center" prompt="未到期62个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_63" align="center" prompt="未到期63个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_64" align="center" prompt="未到期64个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_65" align="center" prompt="未到期65个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_66" align="center" prompt="未到期66个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_67" align="center" prompt="未到期67个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_68" align="center" prompt="未到期68个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_69" align="center" prompt="未到期69个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_70" align="center" prompt="未到期70个月" renderer="Leaf.formatMoney" width="80"/>
<!--<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/>-->
<a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_3" align="center" prompt="未到期3年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_3" align="center" prompt="未到期3年" renderer="Leaf.formatMoney" width="80"/>
...@@ -346,7 +356,7 @@ ...@@ -346,7 +356,7 @@
<a:column name="not_due_amount_46" align="center" prompt="未到期46个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_46" align="center" prompt="未到期46个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_47" align="center" prompt="未到期47个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_47" align="center" prompt="未到期47个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_48" align="center" prompt="未到期48个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_48" align="center" prompt="未到期48个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/> <!--<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/>-->
<a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_3" align="center" prompt="未到期3年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_3" align="center" prompt="未到期3年" renderer="Leaf.formatMoney" width="80"/>
......
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
// Leaf.Masker.unmask(body); // Leaf.Masker.unmask(body);
// return false; // return false;
// } // }
if(H1>60){ if(H1>70){
Leaf.showMessage('${l:PROMPT}', '还款期数应小于60期'); Leaf.showMessage('${l:PROMPT}', '还款期数应小于70期');
Leaf.Masker.unmask(body); Leaf.Masker.unmask(body);
return false; return false;
} }
......
...@@ -1524,8 +1524,8 @@ ...@@ -1524,8 +1524,8 @@
// Leaf.showMessage('${l:PROMPT}', '系统暂时不支持还款期数小于2期的租金计划'); // Leaf.showMessage('${l:PROMPT}', '系统暂时不支持还款期数小于2期的租金计划');
// return false; // return false;
// } // }
if (H1 > 60) { if (H1 > 70) {
Leaf.showMessage('${l:PROMPT}', '还款期数应小于60期'); Leaf.showMessage('${l:PROMPT}', '还款期数应小于70期');
unlock_calc_current_window(); unlock_calc_current_window();
return false; return false;
} }
......
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