Merge branch 'feature/con_change_feature_v4' into develop

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_SEAL_NUMBER.sql

@@ -14,9 +14,9 @@ sys_code_pkg.update_sys_code('SEAL_NUMBER', 'Seal Number', 'Seal Number', 'Seal
 
 sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两份','ZHS','');
 sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两份','US','');
---
--- sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','ZHS','');
--- sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','US','');
+
+sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','ZHS','');
+sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','US','');
 
 end;
 /

src/main/database/Package/cus_con_change_req_pkg.pck

@@ -4,6 +4,18 @@
   -- Created : 9/23/2019 4:25:37 PM
   -- Purpose : 合同變更申請
 
+  --创建时维护默认的用印信息
+  procedure insert_hls_document_use_seal(p_change_req_id       number,
+                                         p_document_table      varchar2,
+                                         p_instruments_types   varchar2,
+                                         p_common_seal         varchar2,
+                                         p_corporate_visa_seal varchar2,
+                                         p_legal_seal          varchar2,
+                                         p_con_special_seal    varchar2,
+                                         p_financial_seal      varchar2,
+                                         p_supervisio_seal     varchar2,
+                                         p_seal_number         varchar2,
+                                         p_user_id             number);
   procedure create_change_req(p_contract_id     number,
                               p_req_date        date,
                               p_req_type        varchar2,
@@ -78,7 +90,52 @@ create or replace package body cus_con_change_req_pkg is
       raise_application_error(sys_raise_app_error_pkg.c_error_number,
                               sys_raise_app_error_pkg.g_err_line_id);
   end;
-
+  --创建时维护默认的用印信息
+  procedure insert_hls_document_use_seal(p_change_req_id       number,
+                                         p_document_table      varchar2,
+                                         p_instruments_types   varchar2,
+                                         p_common_seal         varchar2,
+                                         p_corporate_visa_seal varchar2,
+                                         p_legal_seal          varchar2,
+                                         p_con_special_seal    varchar2,
+                                         p_financial_seal      varchar2,
+                                         p_supervisio_seal     varchar2,
+                                         p_seal_number         varchar2,
+                                         p_user_id             number) is
+  begin
+    insert into hls_document_use_seal
+      (document_use_seal_id,
+       document_table,
+       document_id,
+       instruments_types,
+       common_seal,
+       corporate_visa_seal,
+       legal_seal,
+       con_special_seal,
+       financial_seal,
+       supervisio_seal,
+       seal_number,
+       created_by,
+       creation_date,
+       last_updated_by,
+       last_update_date)
+    values
+      (hls_document_use_seal_s.nextval,
+       p_document_table,
+       p_change_req_id,
+       p_instruments_types,
+       p_common_seal,
+       p_corporate_visa_seal,
+       p_legal_seal,
+       p_con_special_seal,
+       p_financial_seal,
+       p_supervisio_seal,
+       p_seal_number,
+       p_user_id,
+       sysdate,
+       p_user_id,
+       sysdate);
+  end insert_hls_document_use_seal;
   procedure create_change_req(p_contract_id     number,
                               p_req_date        date,
                               p_req_type        varchar2,
@@ -115,6 +172,19 @@ create or replace package body cus_con_change_req_pkg is
                                                p_simulation_flag      => p_simulation_flag,
                                                p_cashflow_change_flag => 'Y',
                                                p_user_id              => p_user_id);
+    if p_req_type = 'LEASE_CHAG' then
+      cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
+                                                          p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
+                                                          p_instruments_types   => '权力义务转让文本',
+                                                          p_common_seal         => 'Y',
+                                                          p_corporate_visa_seal => 'Y',
+                                                          p_legal_seal          => 'N',
+                                                          p_con_special_seal    => 'N',
+                                                          p_financial_seal      => 'N',
+                                                          p_supervisio_seal     => 'N',
+                                                          p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                          p_user_id             => p_user_id);
+    end if;
     p_change_req_id := v_change_req_id;
   end create_change_req;
 

src/main/database/Package/cus_con_contract_repo_pkg.pck

@@ -169,7 +169,7 @@ create or replace package body cus_con_contract_repo_pkg is
     con_contract_history_pkg.create_change_req(p_contract_id       => p_contract_id,
                                                p_change_req_id     => v_change_req_id,
                                                p_req_date          => sysdate,
-                                               p_ref_v01           => null,
+                                               p_ref_v01           => p_user_id,
                                                p_description       => null,
                                                p_change_quotation  => null,
                                                p_change_lease_item => null,
@@ -189,6 +189,29 @@ create or replace package body cus_con_contract_repo_pkg is
            c.last_updated_by            = p_user_id,
            c.last_update_date           = sysdate
      where c.contract_id = v_change_req_id;
+  
+    cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
+                                                        p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
+                                                        p_instruments_types   => '解除融资租赁合同协议',
+                                                        p_common_seal         => 'Y',
+                                                        p_corporate_visa_seal => 'Y',
+                                                        p_legal_seal          => 'N',
+                                                        p_con_special_seal    => 'N',
+                                                        p_financial_seal      => 'N',
+                                                        p_supervisio_seal     => 'N',
+                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_user_id             => p_user_id);
+    cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
+                                                        p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
+                                                        p_instruments_types   => '《融资租赁合同》之补充协议（回购合同）',
+                                                        p_common_seal         => 'Y',
+                                                        p_corporate_visa_seal => 'Y',
+                                                        p_legal_seal          => 'N',
+                                                        p_con_special_seal    => 'N',
+                                                        p_financial_seal      => 'N',
+                                                        p_supervisio_seal     => 'N',
+                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_user_id             => p_user_id);
     p_change_req_id := v_change_req_id;
   end;
   procedure delete_cashflow(p_contract_id number, p_times number) is

src/main/database/Package/cus_con_et_pkg.pck

@@ -84,7 +84,8 @@ create or replace package body cus_con_et_pkg is
   begin
     v_contract_rec := get_contract_rec(p_contract_id, p_user_id);
   
-    if v_contract_rec.contract_status <> 'INCEPT' and p_req_type = 'ET' then
+    if v_contract_rec.contract_status <> 'INCEPT' and
+       p_req_type = 'ET_CHAG' then
       sys_raise_app_error_pkg.raise_sys_others_error(p_message                 => '只有起租状态的合同才能进行提前结清申请！',
                                                      p_created_by              => p_user_id,
                                                      p_package_name            => 'cus_con_et_pkg',
@@ -97,7 +98,7 @@ create or replace package body cus_con_et_pkg is
     con_contract_history_pkg.create_change_req(p_contract_id       => p_contract_id,
                                                p_change_req_id     => v_change_req_id,
                                                p_req_date          => sysdate,
-                                               p_ref_v01           => null,
+                                               p_ref_v01           => p_user_id,
                                                p_description       => null,
                                                p_change_quotation  => null,
                                                p_change_lease_item => null,
@@ -106,6 +107,18 @@ create or replace package body cus_con_et_pkg is
                                                p_simulation_flag   => p_simulation_flag,
                                                p_et_flag           => 'Y',
                                                p_user_id           => p_user_id);
+  
+    cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
+                                                        p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
+                                                        p_instruments_types   => '《融资租赁合同》之补充协议（提前结清）',
+                                                        p_common_seal         => 'Y',
+                                                        p_corporate_visa_seal => 'Y',
+                                                        p_legal_seal          => 'N',
+                                                        p_con_special_seal    => 'N',
+                                                        p_financial_seal      => 'N',
+                                                        p_supervisio_seal     => 'N',
+                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_user_id             => p_user_id);
     p_change_req_id := v_change_req_id;
   end create_change_req_et;
   --通过结清日获取结清相关信息                      

src/main/database/View/hls_document_use_seal_vl.sql

 create or replace view hls_document_use_seal_vl as
 select t.document_use_seal_id,
          t.document_table,
-         t.document_id AS contract_id,
+         t.document_id AS change_req_id,
          t.instruments_types,
          (select v.code_value_name
             from sys_code_values_v v

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

@@ -192,7 +192,6 @@
                             $('${/parameter/@layout_code}_quote').disable();
                         }
                         $('${/parameter/@layout_code}_user_button1').disable();
-                        $('${/parameter/@layout_code}_user_button2').disable();
                     setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
                 } else {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -220,7 +219,6 @@
                                 $('${/parameter/@layout_code}_quote').enable();
                         }
                         $('${/parameter/@layout_code}_user_button1').enable();
-                        $('${/parameter/@layout_code}_user_button2').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 error: function() {
@@ -230,7 +228,6 @@
                                 $('${/parameter/@layout_code}_quote').enable();
                         }
                         $('${/parameter/@layout_code}_user_button1').enable();
-                        $('${/parameter/@layout_code}_user_button2').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 scope: this
@@ -303,14 +300,7 @@
             });
         };
 
-        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
-                $('${/parameter/@layout_code}_user_button1').disable();
-
-                $('${/parameter/@layout_code}_user_button1').enable();
-
-        };
-
-        //////附件上传
+        //附件上传
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record, bp_seq) {
             var link_function = '';
             window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
@@ -696,7 +686,6 @@
             }
         };
 
-        /// 附件上传 end
         //图片渲染
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
                 var result = name.match(/(.*)_pic$/);

src/main/webapp/modules/cont/CON732/hls_ccr_modify_entrance.lview

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    2014-10-27  create bu xuls for 变更申请-支付期调整  维护
-    
+    2019-09 变更申请-维护
  -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
     <a:init-procedure/>

src/main/webapp/modules/cont/CON732/hls_ccr_query_entrance.lview

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    2014-10-27  create bu xuls for 变更申请-支付期调整  查询
-    
+    2019-09 for 变更申请-查询
  -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
           customizationEnabled="true" dynamiccreateenabled="true" trace="true">
@@ -18,12 +17,6 @@
         <a:link id="con_contract_change_req_link"
                 url="${/request/@context_path}/modules/cont/CON701/con_contract_et_print.lsc"/>
         <script type="text/javascript"><![CDATA[
-        var new_recs = []; //任务数组
-        var total_index = 0;
-        var current_index = 0;
-        var file_path = '${/parameter/@file_path}';
-        var download_arr = [];
-
         function open_contract_win(ds_id, record_id) {
             var record = $(ds_id).findById(record_id);
             var param = record.data;
@@ -107,10 +100,10 @@
             param['contract_id'] = record.get('change_req_id');
             if (record.get('ccr_document_type') == 'CUT_CHAG') {
                 param['function_code'] = 'CON733CF_Q';
-                param['url_title'] = '变更申请-合同回款账户变更查询';
+                param['url_title'] = '变更申请-合同租金计划变更查询';
             } else if (record.get('ccr_document_type') == 'LEASE_CHAG') {
                 param['function_code'] = 'CON733BPT_Q';
-                param['url_title'] = '变更申请-合同回款账户变更查询';
+                param['url_title'] = '变更申请-合同承租人变更查询';
             } else if (record.get('ccr_document_type') == 'ACC_CHAG') {
                 //param['function_code'] = 'CON733BPB';
                 param['function_code'] = 'CON733BPBQ';

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

@@ -11,14 +11,6 @@
         <a:link id="con_et001_calc_cashflow_link" model="cont.CON_ET001.calc_cashflow" modelaction="execute"/>
         <a:link id="con_et001_calc_et_date_amount_link" model="cont.CON_ET001.calc_et_date_amount" modelaction="execute"/>
         <script type="text/javascript"><![CDATA[
-        Leaf.onReady(function() {
-            var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
-            if ($(ds_us_id)) {
-                $(ds_us_id).setQueryParameter('document_table','CON_CONTRACT');
-                $(ds_us_id).setQueryParameter('document_id','${/parameter/@contract_id}');
-                $(ds_us_id).query();
-            }
-        });
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
 
@@ -77,7 +69,6 @@
                     $('${/parameter/@layout_code}_submit_approval').disable();
                     $('${/parameter/@layout_code}_save').disable();
                     $('${/parameter/@layout_code}_user_button1').disable();
-                    $('${/parameter/@layout_code}_user_button2').disable();
                     $('${/parameter/@layout_code}_user_button3').disable();
                     setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
                 } else {
@@ -98,7 +89,6 @@
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
-                    $('${/parameter/@layout_code}_user_button2').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
                     $('${/parameter/@winid}').close();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -107,7 +97,6 @@
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
-                    $('${/parameter/@layout_code}_user_button2').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
@@ -115,7 +104,6 @@
                     $('${/parameter/@layout_code}_submit_approval').enable();
                     $('${/parameter/@layout_code}_save').enable();
                     $('${/parameter/@layout_code}_user_button1').enable();
-                    $('${/parameter/@layout_code}_user_button2').enable();
                     $('${/parameter/@layout_code}_user_button3').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
@@ -182,12 +170,7 @@
                 scope: this
             });
         }
-        //生成文本
-        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
-            //$('${/parameter/@layout_code}_user_button2').disable(); //按钮不可用
 
-            //$('${/parameter/@layout_code}_user_button2').enable(); //按钮启用
-        };
         //取消变更
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
@@ -235,6 +218,15 @@
                 }
             }
         };
+        //查询时调用(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>

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

@@ -18,13 +18,6 @@
                 $(ds_id).setQueryParameter('contract_id','${/parameter/@contract_id}');
                 $(ds_id).query();
             }
-
-            // var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
-            // if ($(ds_us_id)) {
-            //     $(ds_us_id).setQueryParameter('document_table','CON_CONTRACT');
-            //     $(ds_us_id).setQueryParameter('document_id','${/parameter/@contract_id}');
-            //     $(ds_us_id).query();
-            // }
         });
         function open_contract_win(ds_id, record_id) {
             var record = $(ds_id).findById(record_id);
@@ -205,6 +198,7 @@
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
             if (calc_flag && maunal_calc_flag){
+                $('${/parameter/@layout_code}_submit_approval').disable();
                 var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract');
                 var req_record = $(req_ds_id).getAt(0);
                 var case_type = '';
@@ -212,12 +206,16 @@
                 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()) {
-                    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']();
-                        return;
-                    }
+                if ($(req_ds_id).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']();
+                    //     return;
+                    // }
+                    $('${/parameter/@layout_code}_submit_approval').disable();
+                    $('${/parameter/@layout_code}_save').disable();
+                    $('${/parameter/@layout_code}_user_button1').disable();
+                    $('${/parameter/@layout_code}_user_button3').disable();
                     setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con_repo001_submit), 2000);
                 } else {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -235,13 +233,25 @@
                     layout_code: '${/parameter/@layout_code}'
                 },
                 success: function(res) {
+                    $('${/parameter/@layout_code}_submit_approval').enable();
+                    $('${/parameter/@layout_code}_save').enable();
+                    $('${/parameter/@layout_code}_user_button1').enable();
+                    $('${/parameter/@layout_code}_user_button3').enable();
                     $('${/parameter/@winid}').close();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 failure: function() {
+                    $('${/parameter/@layout_code}_submit_approval').enable();
+                    $('${/parameter/@layout_code}_save').enable();
+                    $('${/parameter/@layout_code}_user_button1').enable();
+                    $('${/parameter/@layout_code}_user_button3').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 error: function() {
+                    $('${/parameter/@layout_code}_submit_approval').enable();
+                    $('${/parameter/@layout_code}_save').enable();
+                    $('${/parameter/@layout_code}_user_button1').enable();
+                    $('${/parameter/@layout_code}_user_button3').enable();
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 },
                 scope: this
@@ -295,12 +305,6 @@
                 scope: this
             });
         }
-        //生成文本
-        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
-            //$('${/parameter/@layout_code}_user_button2').disable(); //按钮不可用
-
-            //$('${/parameter/@layout_code}_user_button2').enable(); //按钮启用
-        };
         //取消变更
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
@@ -358,6 +362,15 @@
                 }
             }
         };
+        //查询时调用(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>

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

@@ -33,6 +33,7 @@
             var prj_project_result_ds = $(ds_id);
             var records = prj_project_result_ds.getSelected();
             if (records.length != 1) {
+                $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                 Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
                 return;
             }