Merge branch 'feature/fix_bugs' into develop

src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview

@@ -631,7 +631,7 @@
                 </a:fieldSet>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
-                    bindTarget="csh531n_sap_bankflow_info_result_ds" marginHeight="305" marginWidth="30"
+                    bindTarget="csh531n_sap_bankflow_info_result_ds" marginHeight="210" marginWidth="30"
                     navBar="true">
                 <!--                <a:toolBar>-->
                 <!--                    <a:button click="csh531_terminal_manager" text="终端号管理"/>-->

src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview

@@ -643,7 +643,7 @@
                 </a:fieldSet>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
-                    bindTarget="csh531n_sap_bankflow_info_result_ds" marginHeight="305" marginWidth="30"
+                    bindTarget="csh531n_sap_bankflow_info_result_ds" marginHeight="210" marginWidth="30"
                     navBar="true">
                 <!--                <a:toolBar>-->
                 <!--                    <a:button click="csh531_terminal_manager" text="终端号管理"/>-->

src/main/webapp/modules/hls/HLS301/hls_journal_query.lview

@@ -297,7 +297,7 @@
             if (count > limit) {
                 Leaf.showConfirm('提示', '由于凭证行数超过'+limit+'行，传输至SBO后不能立即得到返回结果，您确定继续吗？', function() {
                     //lock_current_window();
-                    lock_current_window2('正在传送，请勿离开当前界面。。。');
+                    Leaf.Masker.mask(Ext.getBody(),'正在传输...请勿离开当前界面...');
                     Leaf.request({
                         url: $('hls301_send_data').getUrl(),
                         para: queryParams,
@@ -306,14 +306,14 @@
                                 msg: '已提交请求',
                                 duration: 3000
                             });
-                            unlock_current_window();
+                            Leaf.Masker.unmask(Ext.getBody());
                             $('hls_journal_header_result_ds').query();
                         },
                         failure: function() {
-                            unlock_current_window();
+                            Leaf.Masker.unmask(Ext.getBody());
                         },
                         error: function() {
-                            unlock_current_window();
+                            Leaf.Masker.unmask(Ext.getBody());
                         },
                         scope: this
                     });