Commit bf1de981 authored by chenzhuo's avatar chenzhuo

新增报单70期调整

parent f044a70c
...@@ -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,
...@@ -100,7 +110,7 @@ ...@@ -100,7 +110,7 @@
where description_id = g.description_id where description_id = g.description_id
and language = 'ZHS') account_name, and language = 'ZHS') account_name,
t.contract_id, t.contract_id,
(SELECT bpv.bp_name (SELECT bpv.bp_name
FROM hls_bp_master_lv bpv,con_contract cc FROM hls_bp_master_lv bpv,con_contract cc
WHERE bpv.bp_id = cc.bp_id_tenant WHERE bpv.bp_id = cc.bp_id_tenant
and cc.contract_id = t.contract_id and cc.contract_id = t.contract_id
...@@ -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,
...@@ -204,7 +224,7 @@ ...@@ -204,7 +224,7 @@
'小计:' account_id_n, '小计:' account_id_n,
null account_name, null account_name,
tt.contract_id, tt.contract_id,
(SELECT bpv.bp_name (SELECT bpv.bp_name
FROM hls_bp_master_lv bpv,con_contract cc FROM hls_bp_master_lv bpv,con_contract cc
WHERE bpv.bp_id = cc.bp_id_tenant WHERE bpv.bp_id = cc.bp_id_tenant
and cc.contract_id = tt.contract_id and cc.contract_id = tt.contract_id
...@@ -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"/>
......
...@@ -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