Merge branch 'baojiayouhua' into develop

src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview

@@ -38,14 +38,14 @@
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
             var repurchase_types = record.get('repurchase_types');
             if (repurchase_types == 'ONE_TIME_REPURCHASE') {
-                record.getField('payment_frequency_n').setRequired(false);
-                record.getField('payment_frequency').setRequired(false);
+              /*  record.getField('payment_frequency_n').setRequired(false);
+                record.getField('payment_frequency').setRequired(false);*/
                 record.getField('payment_period').setRequired(false);
-                record.getField('payment_frequency_n').setReadOnly(true);
+              /*  record.getField('payment_frequency_n').setReadOnly(true);*/
                 record.getField('payment_period').setReadOnly(true);
                 record.set('payment_period', 1);
-                record.set('payment_frequency', null);
-                record.set('payment_frequency_n', null);
+             /*   record.set('payment_frequency', null);
+                record.set('payment_frequency_n', null);*/
             }
         };
         // window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'] = function () {
@@ -359,13 +359,14 @@
         };
         //取消变更
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+            window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
             Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function() {
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('con_repo001_cancel_link').getUrl(),
                     para: {
-                        change_req_id: ${/parameter/@change_req_id}
+                        change_req_id:' ${/parameter/@change_req_id}'
                     },
                     success: function(res) {
                         $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用
@@ -415,14 +416,14 @@
             }
         };
         //查询时调用(grid,table,gridBox)
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
+      /*  window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
             var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
             if (ds == $(ds_us_id)) {
                 ds.setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
                 ds.setQueryParameter('change_req_id','${/parameter/@change_req_id}');
                 ds.query();
             }
-        };
+        };*/
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>