月结租金余额表增加tab&字段

src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm

@@ -705,19 +705,37 @@
         and rownum = 1),
      '否') tenant_change_flag_n,
      nvl((select '是'
+             from dual
+            where not exists (select 1
+                     from con_contract_cashflow ccc
+                    where ccc.cf_item = 1
+                      and ccc.times <= 12
+                      and ccc.contract_id = ct.contract_id
+                      and ccc.write_off_flag != 'FULL'
+                      and ccc.cf_direction = 'INFLOW')
+              and exists (select 1
                      from con_contract_cashflow ccc
                     where ccc.cf_item = 1
                       and ccc.times = 12
                       and ccc.contract_id = ct.contract_id
                       and ccc.write_off_flag = 'FULL'
-        and ccc.cf_direction = 'INFLOW'),
+                      and ccc.cf_direction = 'INFLOW')),
            '否') rental_12_pay_flag,
  nvl((select '是'
              from con_contract_cashflow ccc
             where ccc.cf_item = 9
               and ccc.cf_direction = 'INFLOW'
               and ccc.contract_id = ct.contract_id
-        and ccc.due_amount > 0
+              and (ccc.due_amount > 0 or exists
+                   (select 1
+                      from CON_CONTRACT_CASE_RECORD    cr,
+                           CON_CONTRACT_PENALTY_REDUCE pr,
+                           CON_CONTRACT_PENALTY_INFO   pi
+                     where cr.record_id = pr.record_id
+                       and pr.penalty_reduce_id = pi.penalty_reduce_id
+                       and pr.contract_id = ccc.contract_id
+                       and pi.penalty_reduce_amount > 0
+                       and cr.status = 'APPROVED'))
               and rownum = 1),
            '否') cf_9_exists_flag,
        nvl((select '是'
@@ -725,7 +743,19 @@
             where ccc.cf_item = 9
               and ccc.cf_direction = 'INFLOW'
               and ccc.contract_id = ct.contract_id
-        and ccc.due_amount > 0
+              and (ccc.due_amount > 0 or exists
+                   (select 1
+                      from CON_CONTRACT_CASE_RECORD    cr,
+                           CON_CONTRACT_PENALTY_REDUCE pr,
+                           CON_CONTRACT_PENALTY_INFO   pi,
+                           con_contract_cashflow       cf
+                     where cr.record_id = pr.record_id
+                       and pr.penalty_reduce_id = pi.penalty_reduce_id
+                       and pr.contract_id = ccc.contract_id
+                       and pi.penalty_reduce_amount > 0
+                       and cr.status = 'APPROVED'
+                       and pi.cashflow_id = cf.cashflow_id
+                       and cf.times > 1))
               and ccc.times > 1
               and rownum = 1),
            '否') cf_9_notfirsttime_exists_flag

src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview

@@ -8,7 +8,6 @@
         <a:link id="con_repo_submit_link" model="cont.CON_REPO001.submit_change_req" modelaction="execute"/>
         <a:link id="con_repo001_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
         <a:link id="con_repo001_calc_one_time_cashflow_link" model="cont.CON_REPO001.calc_cashflow" modelaction="execute"/>
-        <a:link id="con_repo001_calc_division_tj_cashflow_link" model="cont.CON_REPO001.calc_cashflow_division_tj" modelaction="execute"/>
         <a:link id="con_repo001_calc_repo_date_amount_link" model="cont.CON_REPO001.calc_repo_date_amount" modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id"
                 url="${/request/@context_path}/modules/cont/CON_REPO001/hls_fin_calculator_update_n.lview"/>
@@ -48,7 +47,6 @@
         };
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
-            debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             if (ds.id == ds_id) {
                 if(record.get('division')=='70'){
@@ -256,6 +254,7 @@
                 }
                 //保证金抵扣金额
                 if(name =='deposit_deduct'&&value>=0){
+                    var deposit_left=record.get('deposit_left') || 0;
                     if (value >deposit_left || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '保证金抵扣金额不能超过保证金余额！');
                         setTimeout(function () {
@@ -298,7 +297,6 @@
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 if (name == 'repurchase_date' && value) {
-                    debugger;
                     Leaf.request({
                         url: $('con_repo001_calc_repo_date_amount_link').getUrl(),
                         para: {
@@ -306,7 +304,6 @@
                             repurchase_date: value
                         },
                         success: function (res) {
-                            debugger;
                             //add by lihh 20210329原合同应收剩余金额取值
                             var rec_residue_amount;
                             record.set('last_rent_due_date', res.result.last_rent_due_date);
@@ -354,7 +351,6 @@
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
             // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            debugger;
             // var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract');
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
             var req_reason_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract_change_req');
@@ -421,7 +417,6 @@
 
         //报价计算
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
-            debugger;
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id_head = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
             var cashflow_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
@@ -472,7 +467,6 @@
                             'contract_id': record.get('contract_id')
                         },
                         success: function(res) {
-                               debugger;
                             window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                             if (calc_session_id) {
                                 //直接进入报价页面
@@ -499,23 +493,7 @@
                                     draggable: true
                                 });
                                 win.on('close', function () {
-                                       Leaf.request({
-                                           url: $('con_repo001_calc_division_tj_cashflow_link').getUrl(),
-                                           para: {
-                                               contract_id: record.get('contract_id'),
-                                           },
-                                           success: function(res) {
-                                               window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                                           },
-                                           failure: function() {
-                                               window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                                           },
-                                           error: function() {
                                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                                           },
-                                           scope: this
-                                       });
-                                      // window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                                     if(cashflow_ds_id&&ds_id_head){
                                         $(cashflow_ds_id).query();
                                         $(ds_id_head).query();}