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

src/main/webapp/WEB-INF/classes/hls/HLS213N/social_code_exist.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: gaoyang
+    $Date: 2013-7-1 上午10:43:21
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                hls_bp_master_pkg.social_code_exist(p_social_code => ${@social_code},
+                                                    p_user_id => ${/session/@user_id},
+                                                    p_exist_flag => ${@exist_flag});
+                hls_document_save_pkg.get_doc_field(
+                p_document_category =>${@document_category},
+                p_document_type     =>${@document_type},
+                p_company_id        =>${/session/@company_id},
+                p_function_code     =>${@function_code},
+                p_function_usage    =>${@function_usage},
+                p_user_id           =>${/session/@user_id},
+                p_bp_class      => ${@bp_class},
+                p_id_type         => ${@id_type},
+                p_id_card_no        => ${@id_card_no},
+                p_organization_code => ${@organization_code},
+                p_bp_info           => ${@bp_info},
+                p_province_id       => ${@province_id},
+                p_document_number   => ${@document_number},
+                p_document_id	    => ${@document_id},
+                p_loan_contract_term_type=>${@loan_contract_term_type}
+                );
+                end;
+                ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="document_number" dataType="java.lang.String" input="true" output="true" outputPath="/parameter/@document_number"/>
+                <bm:parameter name="p_exist_flag" dataType="java.lang.String" input="true" output="true" outputPath="/parameter/@exist_flag"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -11,7 +11,7 @@
         <a:model-query fetchAll="true" model="hls.HLS213N.hls_bp_master_unit" rootPath="user_agent_description"/>
     </a:init-procedure>
     <a:view>
-        <a:link id="get_special_fields_link_id" model="cont.CON500.con_contract_get_special_fields"
+        <a:link id="get_special_fields_link_id" model="hls.HLS213N.social_code_exist"
                 modelaction="update"/>
         <a:link id="gh_nc_post_addsupplierinfo_link" model="hls.HLS213.hls_bp_master_nc_post" modelaction="update"/>
         <a:link id="hls214N_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
@@ -451,6 +451,8 @@
                         document_category: 'BP',
                         document_type: head_record.get('bp_type'),
                         // document_type: 'TENANT',
+                        social_code: head_record.get('social_code'),
+                        exist_flag: 'Y',
                         bp_class: head_record.get('bp_class'),
                         id_type: head_record.get('id_type'),
                         id_card_no: head_record.get('id_card_no'),
@@ -462,10 +464,17 @@
                     },
                     success: function (res) {
                         var document_number = res.result.document_number;
-                        head_record.set('bp_code', document_number);
-                        head_record.set('company_id', '${/session/@company_id}');
-                        head_record.set('unbrand', '${/parameter/@unbrand}');
+                        var exist_flag = res.result.exist_flag;
+                        // alert(exist_flag);
                         check_flag = true;
+                        if(exist_flag == 'Y'){
+                            head_record.set('bp_code', document_number);
+                            head_record.set('company_id', '${/session/@company_id}');
+                            head_record.set('unbrand', '${/parameter/@unbrand}');
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        }else{
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        }
                     },
                     error: function () {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();

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

@@ -256,13 +256,15 @@
 
                 if (record.get('bp_category') == 'VENDER') {
                     record.getField('unit_id_n').setReadOnly(true);
-                }
-                if(employee_type_id == '64'){
-                    record.getField('unit_id_n').setReadOnly(true);
                     record.getField('unit_id_n').setRequired(false);
                 }else{
-                    record.getField('unit_id_n').setReadOnly(false);
-                    record.getField('unit_id_n').setRequired(true);
+                    if(employee_type_id == '64'){
+                        record.getField('unit_id_n').setReadOnly(true);
+                        record.getField('unit_id_n').setRequired(false);
+                    }else{
+                        record.getField('unit_id_n').setReadOnly(false);
+                        record.getField('unit_id_n').setRequired(true);
+                    }
                 }
 
             }