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

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_status.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: feng
+    $Date: 2013-9-11 下午15:13:20
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql>
+                <![CDATA[
+                select v.code_value, v.code_value_name
+                from sys_code_values_v v
+                where v.code = 'CON500_CONTRACT_STATUS'
+                and v.code_value in ('ETING', 'INCEPT', 'TERMINATING')
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm

@@ -159,8 +159,8 @@
                    from hls_bp_master
                   where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
                 --查找厂商
-                (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n
-
+                (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
+                hli.vender_name
            FROM con_contract_cashflow   f,
                 hls_cashflow_item       h,
                 con_contract_lease_item i,

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

@@ -75,8 +75,8 @@
                 url: $('con_contract_create_content_link_id').getUrl(),
                 para: {
                     contract_id: '${/parameter/@contract_id}',
-                    content_type: '${/parameter/@content_type}',
-                    templet_usage: 'CON_SALE'
+                    content_type: '${/parameter/@content_type}'
+                  /*  templet_usage: 'CON_SALE'*/
                 },
                 success: function(res) {
                     var result_ds = $('con_contract_update_print_detail_line_ds');
@@ -102,7 +102,7 @@
 
         function update_attachment_renderer(value, record, name) {
             var content_id = record.get('content_id');
-            return '<a href="javascript:downloadfile_link(' + content_id + ')">下载</a>';
+            return '<a href="javascript:downloadfile_link(' + content_id +')">下载</a>';
         }
 
         function downloadfile_link(content_id) {
@@ -219,8 +219,8 @@
                     <a:column name="bp_category_desc" prompt="HLS.BP_CATEGORY"/>
                     <a:column name="content_print_flag_name" prompt="CON505.CON_CONTENT_STATUS" width="80"/>
                     <a:column name="attachment" align="center" prompt="HLS.ATTACHMENT" renderer="update_attachment_renderer" width="50"/>
-                    <a:column align="center" prompt="附件上传" renderer="attachment_upload" width="80"/>
-                    <a:column name="file_name" align="left" prompt="附件名" renderer="con500_link_render" width="220"/>
+                  <!--  <a:column align="center" prompt="附件上传" renderer="attachment_upload" width="80"/>
+                    <a:column name="file_name" align="left" prompt="附件名" renderer="con500_link_render" width="220"/>-->
                 </a:columns>
             </a:grid>
         </a:screenBody>

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -216,10 +216,16 @@
             param['document_category'] = 'BP';
             param['bp_class'] = record.get('bp_class');
             param['bp_category'] = record.get('bp_category');
-            param['bp_type'] = record.get('bp_type');
+            if( record.get('bp_category')=='AGENT'){
+                param['function_code'] = 'HLS303_Q';
+                param['function_usage'] = 'QUERY';
+            }else{
                 param['function_code'] = 'CON505H';
                 param['function_usage'] = 'QUERY';
-            param['maintain_type'] = 'QUERY';
+            }
+            param['bp_type'] = record.get('bp_type');
+
+
             param['url_title'] = '${l:HLS212.BP_MASTER_QUERY}';
             hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'con505_hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
         };

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -123,7 +123,7 @@
         <a:dataSets>
             <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
             <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
-            <a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
+            <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -123,7 +123,7 @@
         <a:dataSets>
             <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
             <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
-            <a:dataSet id="con560_contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
+            <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview

@@ -221,16 +221,20 @@
 
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
-            if ((ds.id).indexOf('hls_bp_master_credit') != -1 && (ds.id).indexOf('F_ORG_CREDIT') != -1) {
+            // if ((ds.id).indexOf('hls_bp_master_credit') != -1 && (ds.id).indexOf('F_ORG_CREDIT') != -1) {
                 // if (ds.fields.fin_institution_code) {
                 // ds.fields.fin_institution_code.pro.validator = fin_institution_code_validate;
                 // }
                 // if (ds.fields.trade_type_code) {
                 // ds.fields.trade_type_code.pro.validator = trade_type_code_validate;
                 // }
+                // }
+            // }
+            if ((ds.id).indexOf('hls_bp_master') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
+                if (record.get('bp_category') == 'VENDER') {
+                    record.getField('agent_name_n').setReadOnly(true);
+                }
             }
-
-
         };
 
 

src/main/webapp/modules/hls/HLS303/bp_agent_create.lview

@@ -442,28 +442,6 @@
 
             };
 
-            //更新时调用
-            window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
-                var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
-                // if (ds_id == ds.id) {
-                //     if (record.get('taxpayer_type') == 'Y') {
-                //         record.getField('tax_registry_num').setRequired(true);
-                //         record.getField('invoice_bp_address').setRequired(true);
-                //         record.getField('invoice_title').setRequired(true);
-                //         record.getField('invoice_bp_phone_num').setRequired(true);
-                //         record.getField('invoice_bp_bank').setRequired(true);
-                //         record.getField('invoice_bp_bank_account_id').setRequired(true);
-                //     } else {
-                //         record.getField('tax_registry_num').setRequired(false);
-                //         record.getField('invoice_bp_address').setRequired(false);
-                //         record.getField('invoice_title').setRequired(false);
-                //         record.getField('invoice_bp_phone_num').setRequired(false);
-                //         record.getField('invoice_bp_bank').setRequired(false);
-                //         record.getField('invoice_bp_bank_account_id').setRequired(false);
-                //     }
-                }
-            };
-
             //新增时调用(grid,table,gridBox)
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
                 var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');