茂甲控制保证金上线问题修复

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -607,9 +607,9 @@
                 Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
                 return;
             }
-            if ($(ds_id).validate()) {
             debugger;
-                if('${/model/wfl_status/record/@mar_status}' == 'Y'){
+            if ($(ds_id).validate()) {
+                if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
                     if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
                         Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
                         return;

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

@@ -47,18 +47,20 @@
 
         //自定义提交审批保存
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            debugger;
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var  ds_id = 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
             var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
             var record=$(ds_id).getCurrentRecord();
             var params = record.data;
             var marAfterStatus= params.mar_after_status;
+            var beforStatus=params.mar_before_status;
             if(Ext.isEmpty(marAfterStatus)){
                 Leaf.showErrorMessage('提示', '修改后茂甲保证金校验状态不能为空!');
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return false;
             }
-            if (marAfterStatus == '${/model/wfl_status/record/@mar_status}') {
+            if (marAfterStatus == '${/model/wfl_status/record/@mar_status}' || marAfterStatus == beforStatus) {
                 Leaf.showErrorMessage('提示', '请选择与修改前茂甲保证金校验不同的状态');
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return false;
@@ -80,9 +82,6 @@
                     url: $('${/parameter/@layout_code}_csh531_margin_check_save_link_id').getUrl(),
                     para: params,
                     success: function(res) {
-                        window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                        debugger;
-                        window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                         var marginCheckId=res.result.margin_check_id;
                         Leaf.request({
                             url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),