Merge branch 'feature/租前优化' into develop

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -111,7 +111,7 @@
     </bm:primary-key>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
-        <bm:data-filter name="query" expression="(exists (select 1 from csh_write_off cw where cw.csh_transaction_id=transaction_id and cw.write_off_type='DEPOSIT_CREDIT'))"/>
+        <bm:data-filter name="query" expression="(exists (select 1 from csh_write_off cw where cw.csh_transaction_id=transaction_id and cw.write_off_type='DEPOSIT_CREDIT' and cw.reversed_flag='N'))"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -1263,6 +1263,12 @@
         // });
 
         // };
+        //工作流中隐藏按钮
+        Leaf.onReady(function() {
+            if ('${/parameter/@source_type}' == 'WFL') {
+            document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
+            }
+        });
 
 
 

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT104/cus_deposit_write_off_maintain.lview

@@ -119,6 +119,7 @@
                     var win = new Leaf.Window({
                         id: 'csh_write_off_upload_window',
                         params: {
+                            deposit_flag:'Y',
                             transaction_id: record.get('transaction_id'),
                             depositDisplayFlag: depositDisplayFlag,
                             bank_slip_num: record.get('bank_slip_num'),