Merge branch 'feature/hls_bp_master_create_entrance' into develop

src/main/webapp/WEB-INF/server-script/layoutconfig/bp_modify_entrance_g_bp_result_queryfields.js

@@ -28,10 +28,10 @@ var override_queryfields = [
 	name:'class_desc',
 	queryexpression:"t1.bp_class = ${@class_desc}"
 },
-{
-	name:'bp_category_n',
-	queryexpression:"exists (select 1 from hls_bp_master hb where hb.bp_category =${@bp_category} and hb.bp_category<>'AGENT' )"
-},
+// {
+// 	name:'bp_category_n',
+// 	queryexpression:"exists (select 1 from hls_bp_master hb where hb.bp_category =${@bp_category} and hb.bp_category<>'AGENT' )"
+// },
 {	
 	name:'enabled_flag_query',
 	queryexpression:"(t1.enabled_flag=${@enabled_flag_query} or ${@enabled_flag_query}='ALL')"

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

@@ -156,7 +156,6 @@
             if (id_type == 'ID_CARD') {
                 var id_card_no = record.get('id_card_no');
                 if (!checkCard(id_card_no)) {
-                    Leaf.showMessage('提示', '请输入正确格式的身份证！');
                     return '请输入正确格式的身份证';
                 } else {
                     card_identity_flag = 'N';
@@ -245,7 +244,6 @@
             if (card_type_sp == 'ID_CARD') {
                 var id_no_sp = record.get('id_no_sp');
                 if (!checkCard(id_no_sp)) {
-                    Leaf.showMessage('提示', '请输入正确格式的身份证！');
                     return '请输入正确格式的身份证';
                 } else {
                     card_identity_flag = 'N';

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

@@ -215,7 +215,7 @@
             var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var gird_ds_id = 'BP_NP_MODIFY_N_BP_ASSETS01_hls_bp_assets_ds';
             var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
-            var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow')
+            var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
             if(gird_ds_id==ds.id||gird_ds_id2==ds.id){
                if(name=='relationship_with_bp'){
                     if(value=='A7501'){

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

@@ -68,9 +68,9 @@
             var param = record.data;
             param['function_code'] = 'HLS214D';
             // debugger;
-            if (record.get('bp_category') == 'AGENT') {
-                param['function_code'] = 'HLS228DL';
-            }
+            // if (record.get('bp_category') == 'AGENT') {
+            //     param['function_code'] = 'HLS228DL';
+            // }
             param['function_usage'] = 'MODIFY';
             param['bp_class'] = record.get('bp_class');
             param['cond_para1'] = user_category;