Commit e66e1434 authored by niminmin's avatar niminmin

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

parents 1251a148 412de99e
Pipeline #3700 canceled with stages
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</bm:primary-key> </bm:primary-key>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> <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:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/> <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
...@@ -1263,6 +1263,12 @@ ...@@ -1263,6 +1263,12 @@
// }); // });
// }; // };
//工作流中隐藏按钮
Leaf.onReady(function() {
if ('${/parameter/@source_type}' == 'WFL') {
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
});
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
var win = new Leaf.Window({ var win = new Leaf.Window({
id: 'csh_write_off_upload_window', id: 'csh_write_off_upload_window',
params: { params: {
deposit_flag:'Y',
transaction_id: record.get('transaction_id'), transaction_id: record.get('transaction_id'),
depositDisplayFlag: depositDisplayFlag, depositDisplayFlag: depositDisplayFlag,
bank_slip_num: record.get('bank_slip_num'), bank_slip_num: record.get('bank_slip_num'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment