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

# Conflicts:
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

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

@@ -154,6 +154,7 @@
         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') != -1) {
                 // record.getField('cell_phone').setRequired(true);
+                //record.getField('cell_phone').setRequired(true);
                 //身份证验证
                 if (ds.fields.id_card_no) {
 

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

@@ -117,6 +117,21 @@
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
                 var head_record = $(ds_id).getCurrentRecord();
                 var check_flag = false;
+                //对统一社会信用代码和身份生进行校验
+
+                var social_code=head_record.get('social_code');
+                var id_card_no_leg=head_record.get('id_card_no_leg');
+                if(!checkCard(id_card_no_leg)){
+                    $L.showErrorMessage("错误",'请输入合法的身份证号！',null,null);
+                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    return false;
+                }
+                if(!CheckSocialCreditCode(social_code)){
+                    $L.showErrorMessage("错误",'请输入正确的社会信用代码！',null,null);
+                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    return false;
+                }
+
                 if (head_record.get('bp_code')) {
                     return true;
                 }