Commit 328d92cc authored by stone's avatar stone

Merge branch 'refs/heads/feature/fix_bug' into develop

parents 26080351 179c6a98
......@@ -10,9 +10,11 @@
<bm:operation name="query">
<bm:query-sql>
<![CDATA[
select c.contract_id, c.contract_number, c.contract_name
select *
from (select c.contract_id, c.contract_number, c.contract_name
from con_contract c
where c.data_class = 'NORMAL'
where c.data_class = 'NORMAL') V
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
var override_queryfields = [
{
name: 'invoice_date_from',
queryexpression: "trunc(t1.invoice_date) >= to_date(${/parameter/@invoice_date_from},'yyyy-mm-dd')"
},
{
name: 'invoice_date_to',
queryexpression: "trunc(t1.invoice_date) <= to_date(${/parameter/@invoice_date_to},'yyyy-mm-dd')"
},
];
var add_datafilters = [ {
name : 'confirmation_status',
expression : "t1.confirmation_status is not null"
} ];
}
];
add_datafilter();
override();
var override_queryfields = [
{
name: 'invoice_date',
queryexpression: "trunc(t1.invoice_date) >= to_date(${/parameter/@invoice_date},'yyyy-mm-dd')"
},
{
name: 'to_invoice_date',
queryexpression: "trunc(t1.invoice_date) <= to_date(${/parameter/@to_invoice_date},'yyyy-mm-dd')"
},
{
name: 'creation_date',
queryexpression: "trunc(t1.update_date) >= to_date(${/parameter/@creation_date},'yyyy-mm-dd')"
},
{
name: 'to_creation_date',
queryexpression: "trunc(t1.update_date) <= to_date(${/parameter/@to_creation_date},'yyyy-mm-dd')"
}
];
override();
......@@ -17,7 +17,9 @@
var invoice_number = strs[3];
var net_amount = strs[4];
var invoice_date = strs[5];
//检验设备价格需要大于不含税金额
if (strs.length == 8) {
Leaf.request({
url: $('acp_invoice_inf_import_link').getUrl(),
para: {
......
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