Merge branch 'refs/heads/bp_agent' into develop

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -111,7 +111,7 @@
                                 }
                             }*/
                             if(price_list=='HL_PRICR_E' ||price_list=='HL_PRICR_TEST'||price_list=='HL_PRICR_NTEST'||price_list=='HL_PRICR_EN'){
-                                if(payment_deduction!='TRADE_IN'){
+                                if(payment_deduction!='TRADE_IN' && payment_deduction!='TRI_AGREEMENT' ){
                                     var record = $('hls_fin_calculator_hd_ds').getAll();
                                     for (var i = 0;i < temp_head_records.length;i++) {
                                         if(record[i].get('column_code')=='H109') {

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -514,7 +514,19 @@ function prj501n_contract_number_renderer(id, name, query_only){
                 }
             }
 
+        };
 
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+            if(ds_id==ds.id && ds_id){
+                if(record.get('pay_method') == 'WIRE_TRANSFER'){
+                    record.getField('bank_branch_name').setReadOnly(true);
+                    record.getField('bank_branch_name_n').setReadOnly(true);
+                    record.getField('bank_branch_name').setRequired(false);
+                    record.getField('bank_branch_name_n').setRequired(false);
+
+                }
+            }
         };
 
         //pdf预览  add by zhuxianfei