[fix] bug修改

src/main/database/Package/cus_con_et_pkg.pck

@@ -177,15 +177,20 @@ create or replace package body cus_con_et_pkg is
        and f.cf_type = 1
        and f.contract_id = p_contract_id;
     --上一次完全核销现金流
-    select (p_et_date - f.due_date + 1) fund_possession_time
-      into v_fund_possession_time
-      from con_contract_cashflow f
-     where f.due_date > p_et_date
-       and f.write_off_flag = 'FULL'
-       and f.cf_item = 1
-       and f.cf_type = 1
-       and f.cf_direction != 'NONCASH'
-       and f.contract_id = p_contract_id;
+    begin
+      select (p_et_date - f.due_date + 1) fund_possession_time
+        into v_fund_possession_time
+        from con_contract_cashflow f
+       where f.due_date > p_et_date
+         and f.write_off_flag = 'FULL'
+         and f.cf_item = 1
+         and f.cf_type = 1
+         and f.cf_direction != 'NONCASH'
+         and f.contract_id = p_contract_id;
+    exception
+      when no_data_found then
+        v_fund_possession_time := 1;
+    end;
     v_fund_possession_cost := v_sum_unreceived_principal *
                               nvl(v_fund_possession_time, 1) *
                               NVL(p_et_interest_rate,

src/main/database/Register_function/REGISTER_CON_ET003.sql

@@ -30,6 +30,7 @@ sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_et_date_am
 sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_cashflow');
 sys_function_assign_pkg.func_bm_load('CON_ET003','basic.hls_division_for_lov');
 sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.submit_change_req');
+sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON701.hls_bp_master_v_all_lov');
 
 --分配菜单
 sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET003',p_enabled_flag=>'Y',P_USER_ID=>-1);

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -175,12 +175,13 @@
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
                 $('${/parameter/@layout_code}_submit_approval').disable();
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var req_ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
             var req_record = $(req_ds_id).getAt(0);
             var case_type = '';
             var document_type = '${/parameter/@document_type}';
             var calc_session_id = req_record.get('calc_session_id');
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-                if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
+                if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable()) && $(req_ds_id2).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
                     // if (req_record.dirty) {
                     //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
                     //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -218,15 +218,6 @@
                 }
             }
         };
-        //查询时调用(grid,table,gridBox)
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
-            var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
-            if (ds == $(ds_us_id)) {debugger
-                ds.setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
-                ds.setQueryParameter('change_req_id','${/parameter/@change_req_id}');
-                ds.query();
-            }
-        };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>