Merge branch 'refs/heads/feature/bug_fix' into develop

src/main/webapp/modules/cont/CON1020/contract_penalty_reduction_create.lview

@@ -77,7 +77,6 @@
             if(!$(ds_id1).validate()){
                 window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return;
-
              }
 
             var record1 = $(ds_id1).getCurrentRecord();

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

@@ -37,6 +37,16 @@ $Purpose: 商业伙伴授信创建
 
         };
 
+        //保存成功后刷新页面credit_ds
+        // window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
+        //     Leaf.SideBar.show({
+        //         msg: '操作成功',
+        //         duration: 2000
+        //     });
+        //     $('credit_ds').query();
+        //     $('${/parameter/@winid}').close();
+        //     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+        // };
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

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

@@ -59,6 +59,8 @@ $Purpose: 商业伙伴授信维护
                 success: function ()  {
 
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    $('${/parameter/@winid}').close();
+                    $('credit_ds').query();
 
                 },
                 error: function() {

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

@@ -102,7 +102,9 @@ $Purpose: 商业伙伴授信维护
             param['credit_date_from']=datas[0].get('credit_date_from');
             param['credit_total_amount']=datas[0].get('credit_total_amount');
             param['bp_code']=datas[0].get('bp_code');
-            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_maintain_link', null);
+            param['winid']='hls_bp_credit_winId';
+
+            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_maintain_link', credit_ds);
 
 
            /* var credit_date_from=Leaf.formatDate(datas[0].data.credit_date_from)
@@ -160,12 +162,14 @@ $Purpose: 商业伙伴授信维护
         }
         //商业伙伴创建按钮
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+            var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
             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);
+            param['winid']='hls_bp_create_winid';
+            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_create_link', credit_ds);
         }
         //--承租人的详细信息
         function on_business_tenant_detail_window(id, name) {