Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
328d92cc
Commit
328d92cc
authored
Nov 30, 2019
by
stone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refs/heads/feature/fix_bug' into develop
parents
26080351
179c6a98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
3 deletions
+34
-3
acp_import_contract_lov.lwm
...pp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm
+4
-2
ap_invoice_confirm_g_ap_queryfields.js
...cript/layoutconfig/ap_invoice_confirm_g_ap_queryfields.js
+10
-1
ap_invoice_import_detail_g_ap_queryfields.js
...layoutconfig/ap_invoice_import_detail_g_ap_queryfields.js
+18
-0
ap_invoice_import_scanning.lview
...ebapp/modules/acp/ACP522/ap_invoice_import_scanning.lview
+2
-0
No files found.
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_import_contract_lov.lwm
View file @
328d92cc
...
...
@@ -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>
...
...
src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_confirm_g_ap_queryfields.js
View file @
328d92cc
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
();
src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_import_detail_g_ap_queryfields.js
View file @
328d92cc
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
();
src/main/webapp/modules/acp/ACP522/ap_invoice_import_scanning.lview
View file @
328d92cc
...
...
@@ -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: {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment