Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm

@@ -84,7 +84,7 @@
         <bm:query-field name="contract_id" queryExpression="(ccc.contract_id = ${@contract_id})"/>
         <bm:query-field name="cf_item" queryExpression="(ccc.cf_item = ${@cf_item})"/>
         <bm:query-field name="bp_id_tenant" queryExpression="(bp_id_tenant = ${@bp_id_tenant})"/>
-        <bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent = ${@bp_id_agent})"/>
+        <bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent_level1 = ${@bp_id_agent})"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(c.contract_id = ccc.contract_id AND c.data_class = 'NORMAL' AND ccc.write_off_flag != 'FULL' AND c.contract_status IN ('INCEPT') AND ccc.cf_status = 'RELEASE' AND ccc.cf_direction = 'INFLOW' AND c.pay_method IS NOT NULL AND ccc.cf_item IN (1, 8, 9))"/>

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_readonly.lview

@@ -17,6 +17,9 @@
         </s:server-script>
     </a:init-procedure>
     <a:view>
+        <a:link id="bp_tenant_detail_query_link" model="prj.PRJ500D.bp_tenant_old_r_query" modelaction="query"/>
+        <a:link id="${/parameter/@layout_code}_tenant_rate_query_link"
+                url="${/request/@context_path}/modules/prj/PRJ902/prj_project_score_result.lview"/>
         <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}get_special_fields_link_id"
                 model="cont.CON500.con_contract_get_special_fields" modelaction="update"/>
         <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
@@ -338,6 +341,47 @@
             }
         };
 
+        //客户评分
+        window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function () {
+
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+
+            var record = $(ds_id).getCurrentRecord();
+            if (record) {
+                var param = record.data;
+                if (record.get('project_id')) {
+                    param['project_id'] = record.get('project_id');
+                    param['winid'] = 'hl_tenant_score_rate_win_id';
+                    param['url_title'] = '客户评分明细';
+                    var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
+                    var r = $(score_ds_id).getCurrentRecord();
+                    if (r.dirty) {
+                        Leaf.showInfoMessage('提示', '评分数据发生修改，请先保存再进行评分');
+                        return;
+                    }
+                    if ($(ds_id).validate()) {
+                        var win = new Leaf.Window({
+                            id: param['winid'],
+                            params: param,
+                            url: $('${/parameter/@layout_code}_tenant_rate_query_link').getUrl(),
+                            title: param['url_title'],
+                            fullScreen: true,
+                            draggable: true
+                        });
+                        win.on('close', function () {
+                            $(ds_id).setQueryParameter('project_id',record.get('project_id'));
+                            $(ds_id).query();
+                        });
+                    }
+                } else {
+                    Leaf.showMessage('${l:PROMPT}', '请先保存');
+                    return;
+                }
+            }
+
+
+        };
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>