Commit afb79776 authored by 18083's avatar 18083

Merge remote-tracking branch 'origin/remote_dev' into remote_dev

parents 2817b3fd e7acb511
......@@ -36,6 +36,7 @@
hc.last_updated_by,
hc.bp_id,
hc.bank_account_id,
hc.bp_category,
'N' re_flag,
NULL AS bank_num_r,
NULL AS bank_receipt_date_r,
......@@ -80,6 +81,7 @@
hc.last_updated_by,
hc.bp_id,
hc.bank_account_id,
hc.bp_category,
'Y' re_flag,
a.bank_num bank_num_r,
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
......@@ -100,11 +102,11 @@
</bm:operations>
<bm:query-fields>
<!-- <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= to_date(${@exchange_hour_from},&apos;yyyy-mm-dd&apos;)"/>-->
<!-- <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= to_date(${@exchange_hour_to},&apos;yyyy-mm-dd&apos;)"/>-->
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields>
</bm:model>
......@@ -148,11 +148,11 @@
</bm:operations>
<bm:query-fields>
<!-- <bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= to_date(${@exchange_hour_from},&apos;yyyy-mm-dd&apos;)"/>-->
<!-- <bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= to_date(${@exchange_hour_to},&apos;yyyy-mm-dd&apos;)"/>-->
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields>
......
......@@ -456,7 +456,7 @@
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:form id="success_form" height="400" title="THE_IMPORTED_DATA" width="980">
<a:form id="success_form" height="400" title="收款导入" width="980">
<a:screenTopToolbar>
<a:gridButton click="backBtn" text="退出"/>
<a:gridButton click="import_btn" text="导入"/>
......
......@@ -511,7 +511,7 @@
url:$('agricultural_bank_link').getUrl(),
title: '农行回单',
width: 1500,
height: 590
height: 580
});
}
......
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