Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
32194cc2
Commit
32194cc2
authored
Oct 31, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] fix report gen mult result
parent
70012bb6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
3 deletions
+20
-3
vat-caculate-data.ctrl.js
...vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
+20
-3
No files found.
atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
View file @
32194cc2
...
...
@@ -323,18 +323,27 @@
});
if
(
unstarted
)
{
var
readyTasks
;
var
isGenedAll
=
false
;
var
isReport
=
false
;
if
(
!
_
.
isEmpty
(
$scope
.
resolveRef
))
{
readyTasks
=
_
.
reject
(
$scope
.
tasks
[
task
.
seqNo
+
1
].
items
,
function
(
t
)
{
return
_
.
some
(
$scope
.
resolveRef
,
function
(
x
)
{
if
(
$scope
.
tasks
[
task
.
seqNo
+
1
].
isReportTask
)
isReport
=
true
;
return
!
x
.
resolved
&&
x
.
referTo
===
t
.
id
;
});
});
}
else
{
readyTasks
=
$scope
.
tasks
[
task
.
seqNo
+
1
].
items
;
if
(
$scope
.
tasks
[
task
.
seqNo
+
1
].
isReportTask
)
isReport
=
true
;
}
readyTasks
.
forEach
(
function
(
t
)
{
t
.
doTask
();
if
(
isReport
&&!
isGenedAll
){
t
.
doTask
();
isGenedAll
=
true
;
}
t
.
status
=
'processing'
;
t
.
text
=
$translate
.
instant
(
t
.
status
);
});
...
...
@@ -376,8 +385,16 @@
var
updateProgress
=
function
(
data
,
task
,
ifWriteLog
)
{
if
(
data
&&
data
.
result
)
{
task
.
status
=
'completed'
;
task
.
text
=
$translate
.
instant
(
task
.
status
);
if
(
$scope
.
tasks
[
task
.
seqNo
].
isReportTask
){
$scope
.
tasks
[
task
.
seqNo
].
items
.
forEach
(
function
(
t
)
{
t
.
status
=
'completed'
;
t
.
text
=
$translate
.
instant
(
t
.
status
);
});
}
else
{
task
.
status
=
'completed'
;
task
.
text
=
$translate
.
instant
(
task
.
status
);
}
}
else
{
task
.
status
=
'error'
;
...
...
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