茂甲控制保证金校验页面优化

src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_check_wfl.lwm

@@ -28,16 +28,16 @@
 
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-SELECT Mar_After_Status AS Mar_Status,
+select Mar_After_Status as Mar_Status, mar_after_status_n
+  from (select t.mar_after_status,
                (SELECT Code_Value_Name
-				FROM   Sys_Code_Values_v, Csh_Margin_Check T1
-				WHERE  Code = 'MARGIN_CHECK_STATUS'
-							 AND Code_Value = T1.Mar_After_Status
-							 AND t.Margin_Check_Id = T1.Margin_Check_Id) Mar_After_Status_n
-FROM   Csh_Margin_Check t
-WHERE  t.Wfl_Status = 'APPROVED'
-			 AND Rownum = 1
-ORDER  BY t.Creation_Date DESC
+                  FROM Sys_Code_Values_v sv
+                 where sv.code = 'MARGIN_CHECK_STATUS'
+                   and sv.code_value = t.mar_after_status) mar_after_status_n
+          from Csh_Margin_Check t
+         where t.wfl_status = 'APPROVED'
+         order by t.creation_date desc)
+ where Rownum = 1
 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -492,9 +492,9 @@
         }
 
         function csh531_margin_check() {
-            debugger;
             var param={};
             param['function_code']= 'CSH531F3';
+            param['function_usage'] = 'MODIFY';
             param['url_title']='控制茂甲保证金校验';
             hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
         }

src/main/webapp/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview

@@ -9,8 +9,9 @@
                 <a:link id="${/parameter/@layout_code}_csh531_margin_check_submit_link_id" model="csh.CSH531F.csh_transaction_recoi_check_wfl" modelaction="execute"/>
         <script type="text/javascript"><![CDATA[
         $L.onReady(function () {
-            if("${/parameter/@function_usage}" == 'QUERY'){
+            if("${/parameter/@function_usage}" == 'QUERY' && document.getElementById('${/parameter/@layout_code}_user_button1') && document.getElementById('${/parameter/@layout_code}_save')){
                 $jq('#${/parameter/@layout_code}_user_button1').hide();
+                $jq('#${/parameter/@layout_code}_save').hide();
                 var marginCheckId="${/parameter/@MARGIN_CHECK_ID}";
                 var ds_query_id= 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
                 var ds_result_id= 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
@@ -23,12 +24,11 @@
 
             var ds_id= 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
             var record= $(ds_id).getCurrentRecord();
-            var marAfterStatus = record.get('mar_before_status');
-            if('${/model/wfl_status/record/@mar_status}' == '' || '${/model/wfl_status/record/@mar_status}' == undefined){
+            if(Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
                 record.set('mar_before_status','Y');
                 record.set('mar_before_status_n','打开');
             }
-            if('${/model/wfl_status/record/@mar_status}' != ''){
+            if(!Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
                 record.set('mar_before_status','${/model/wfl_status/record/@mar_status}');
                 record.set('mar_before_status_n','${/model/wfl_status/record/@mar_after_status_n}');
             }
@@ -59,7 +59,6 @@
                     success: function(res) {
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@winid}').close();
-                        console.log(res);
                         Leaf.SideBar.show({
                             msg: '操作成功',
                             duration: 200
@@ -80,6 +79,7 @@
         //保存前调用
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
             var check_flag=true;
+
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id='MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
             var ds_query_id = 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';