新增代理店北京慧珠及费用合并报表调整

src/main/webapp/WEB-INF/classes/rpt/RPT7100/rpt_asset_commission_split.lwm

@@ -121,7 +121,7 @@ SELECT *
                       to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
                   nvl((SELECT sum(NVL(round(ccw.due_amount /
                                            (nvl((select hf.vat_rate
-                                        from hl_asset_manage_fee hf
+                                        from hlcm_comsn_reconcilia hf
                                        where hf.cashflow_id = ccw.cashflow_id),
                                       nvl(hlcm_monthend_je_pkg.get_acp_rate(cc.bp_id_agent_level1),
                                           0.06)) + 1),

src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview

@@ -51,7 +51,6 @@
 
 
             function open_contract_win(ds_id, record_id) {
-                debugger;
                 var record = $(ds_id).findById(record_id);
                 var param = record.data;
                 if(record.get('division')!='95'){
@@ -89,8 +88,7 @@
             }
 
         function open_project_Window(record_id, ds_id) {
-            debugger;
-            var record = $(ds_id).findById(record_id);
+             var record = $(ds_id).findById(record_id);
             var param = record.data;
             var url;
             param['hide_flag'] = 'Y';
@@ -199,10 +197,11 @@
                 }
             };*/
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
-            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var records = $(ds_id).getSelected();
             var division=records[0].data.division;
             var division_detail = records[0].data.division_detail;
+            var bp_id_agent_code = records[0].data.bp_id_agent_code;
             if(division == '95'){
                 Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本！');
                 return;
@@ -216,6 +215,11 @@
                 Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本！');
                 return;
                 }
+               //代理店北京慧珠不支持打印纸质合同文本
+               if(bp_id_agent_code=='D00010038'){
+                Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本！');
+                return;
+                }
             }
             var record=records[0];
             new Leaf.Window({