Merge branch 'refs/heads/baojia_detail' into develop

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -42,6 +42,7 @@
         <a:link id="check_prj_lease_item_link_id" model="prj.PRJ501N.project_approval" modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}tenant_rate_query_link"
                 url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_history_display.lview"/>
+        <a:model-query fetchAll="true" model="prj.PRJ500D.prj_occu_object_display" rootPath="occu_object"/>
         <script type="text/javascript"><![CDATA[
       //  alert('${/parameter/@division}')
         //add by zhuxianfei
@@ -433,27 +434,17 @@
         };
         //更新时调用
         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'], 'prj_project_lease_item');
-            if (ds_id == ds.id) {
-                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
-                var record = $(ds_id).getCurrentRecord();
-                Leaf.request({
-                    url: $('check_prj_lease_item_link_id').getUrl(),
-                    para: {
-                        'machine_number': record.get('machine_number')
-                    },
-                    success: function(res) {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    failure: function() {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    error: function() {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    scope: this
-                });
-            }*/
+            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(true);
+                record.getField('bank_branch_name_n').setRequired(true)
+            }else{
+                record.getField('bank_branch_name').setReadOnly(false);
+                record.getField('bank_branch_name_n').setReadOnly(false);
+                record.getField('bank_branch_name').setRequired(false);
+                record.getField('bank_branch_name_n').setRequired(false)
+            }
         };
 
 
@@ -574,6 +565,7 @@
 
         }
 
+
         /*  Leaf.onReady(function(){
               var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
               var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';

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

@@ -476,29 +476,18 @@ function prj501n_contract_number_renderer(id, name, query_only){
         };
         //更新时调用
         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'], 'prj_project_lease_item');
-            if (ds_id == ds.id) {
-                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
-                var record = $(ds_id).getCurrentRecord();
-                Leaf.request({
-                    url: $('check_prj_lease_item_link_id').getUrl(),
-                    para: {
-                        'machine_number': record.get('machine_number')
-                    },
-                    success: function(res) {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    failure: function() {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    error: function() {
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    },
-                    scope: this
-                });
-            }*/
+            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)
+            }else{
+                record.getField('bank_branch_name').setReadOnly(false);
+                record.getField('bank_branch_name_n').setReadOnly(false);
+            }
         };
 
+
         //加载时调用(grid,table,gridBox)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');