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
f182be29
Commit
f182be29
authored
Apr 24, 2019
by
ken.q.you
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix box close bug---Ken
parent
01f0f00b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
vat-caculate-data.ctrl.js
...vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
+4
-3
No files found.
atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
View file @
f182be29
...
...
@@ -381,7 +381,7 @@
var
year
=
now
.
getFullYear
();
var
vatMonth
=
vatSessionService
.
month
;
if
(
vatSessionService
.
year
==
year
){
if
(
vatMonth
===
month
-
1
){
if
(
vatMonth
===
month
||
vatMonth
===
month
-
1
){
return
false
;
}
else
{
return
true
;
...
...
@@ -430,8 +430,8 @@
var
startCaculate2
=
function
()
{
if
(
vatSessionService
.
project
.
projectStatusList
[
vatSessionService
.
month
]
>=
constant
.
ProjectStatusEnum
.
Generated
)
{
swal
({
if
(
vatSessionService
.
project
.
projectStatusList
[
vatSessionService
.
month
]
>=
constant
.
ProjectStatusEnum
.
Generated
)
{
swal
({
title
:
"warning!"
,
text
:
$translate
.
instant
(
'IsConfirmReCalcuate'
).
formatObj
({
status
:
vatCommonService
.
getProjectStautsEnumDesc
(
vatSessionService
.
project
.
projectStatusList
[
vatSessionService
.
month
])}),
type
:
"warning"
,
...
...
@@ -478,6 +478,7 @@
}
else
{
doStartCaculate2
(
false
);
swal
.
close
();
}
};
...
...
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