Merge branch 'feature/return_money_feature' into develop

src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql

@@ -132,4 +132,16 @@ INSERT INTO sys_function_dynamic
    last_updated_by)
 VALUES
   ('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
-end;
+end;
\ No newline at end of file
+
+--创建动态页面的虚拟功能号
+INSERT INTO sys_function_dynamic
+  (function_code,
+   function_name,
+   sequence,
+   creation_date,
+   created_by,
+   last_update_date,
+   last_updated_by)
+VALUES
+  ('HLS36105', '商业伙伴授信维护', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file

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

@@ -6,8 +6,9 @@ spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
 set feedback off
 set define off
 
-<!--系统代码取值-->
+<!--授信状态字段-->
 BEGIN
+
 sys_code_pkg.delete_sys_code('CREDIT_STATUS');
 sys_code_pkg.insert_sys_code('CREDIT_STATUS', '授信状态', '授信状态', '授信状态', 'ZHS', '');
 sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','ENABLE','启用','ZHS','');
@@ -16,7 +17,6 @@ sys_code_pkg.insert_sys_code_value('CREDIT_STATUS','DISABLE','停用','ZHS','');
 
 END;
 /
-commit;
 set feedback on
 set define on
 

src/main/database/Register_function/REGISTER_HLS36105.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_CON_REPO001.log
+
+set feedback off
+set define off
+
+
+--页面注册
+begin
+
+sys_function_assign_pkg.service_load('modules/hls/HLS361N/credit_credit.lview','商业伙伴授信维护',1,1,0);
+sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/credit_credit.lview');
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/webapp/WEB-INF/classes/hls/HLS361N/hls_bp_master_create_check_data.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sf
+    $Date: 2019-09-23 18:30:34
+    $Revision: 1.0
+    $Purpose: 修改授信的状态
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+             begin
+                hls_bp_master_credit_pkg.check_save_data(
+                                  p_bp_credit_hd_id   =>${@bp_credit_hd_id},
+                                  p_bp_id             =>${@bp_id},
+                                  p_user_id           =>${/session/@user_id}
+                                );
+                end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
+
+

src/main/webapp/modules/hls/HLS361N/credit_credit.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author: sf
+$Date: 2019/09/24 21:19
+$Revision: 1.0
+$Purpose: 商业伙伴授信创建
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
+    </a:init-procedure>
+    <a:view>
+        <a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+
+        <script type="text/javascript"><![CDATA[
+        //保存前调用
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
+            window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+            var check_flag = true;
+
+
+           if( record.get('credit_total_amount')<0){
+               $L.showErrorMessage("错误",'信用总额度不能为负数',null,null);
+               window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+               return false;
+           }
+           if(record.get('credit_date_to')<record.get('credit_date_from')){
+               $L.showErrorMessage("错误",'授信结束时间不能小于开始时间',null,null);
+               window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+               return false;
+           }
+
+            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+           return  check_flag;
+
+
+        };
+
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -14,6 +14,7 @@ $Purpose: 商业伙伴授信维护
     <a:view>
         <a:link id="hn1150_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="hls361_hls_bp_master_credit_tenant_detail_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_entrance_detail.lview"/>
+        <a:link id="hls361_hls_bp_master_create_link" url="${/request/@context_path}/modules/hls/HLS361N/credit_credit.lview"/>
         <a:link id="hls361_hls_bp_master_credit_agent_detail_link" url="${/request/@context_path}/modules/hls/HLS362N/credit_entrance_detail_confirm.lview"/>
         <a:link id="hls361N_update_credit_status_link_id" model="hls.HLS361N.hls_bp_master_credit_update_status" modelaction="update"/>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
@@ -110,8 +111,6 @@ $Purpose: 商业伙伴授信维护
             }
             //用户点击“授信额度变更”按钮后，授信状态变为“审批冻结”，该商业伙伴无法提报单据，同时需要记录变更前的“授信总额度”录入值（后台表）；
            //锁屏
-            console.log(datas[0]);
-
 
             $L.showConfirm("提示",'确认变更该条记录的相关信息？',function(){
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
@@ -142,12 +141,20 @@ $Purpose: 商业伙伴授信维护
 
 
 
+        }
+        //商业伙伴创建按钮
+        window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+            var param={};
+            param['function_code'] = 'HLS36105';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'UPDATE';
+            param['url_title'] = '商业伙伴授信维护';
+            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_create_link', null);
         }
         //--承租人的详细信息
         function on_business_tenant_detail_window(id, name) {
             //获得该条record的所有数据
             var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
-            console.log(record)
             var param = record.data;
             param['function_code'] = 'HLS36101';
             param['function_usage'] = 'MODIFY';