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

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');