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
fecfab64
Commit
fecfab64
authored
Nov 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfx] fixed lit bugs
parent
3c7421e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
ApprovalService.java
...va/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
+1
-2
vat-report-view.html
.../app/common/controls/vat-report-view/vat-report-view.html
+2
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
View file @
fecfab64
...
...
@@ -152,11 +152,10 @@ public class ApprovalService {
taskService
.
complete
(
task
.
getId
(),
map
);
pa
.
setId
(
uuid
);
periodApproveMapper
.
updateByPrimaryKeySelective
(
pa
);
pa
.
setApprovalBy
(
"Admin"
);
pa
.
setApprovalTime
(
new
Date
());
pa
.
setApprovalResualt
(
comment
);
periodApproveMapper
.
updateByPrimaryKey
(
pa
);
periodApproveMapper
.
updateByPrimaryKey
Selective
(
pa
);
}
else
{
logger
.
warn
(
"task must not null or size gt 1"
);
}
...
...
atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.html
View file @
fecfab64
...
...
@@ -169,10 +169,10 @@
</tr>
<tr>
<td
style=
"float:right;border-top:none;"
>
<button
class=
"btn btn-sm"
ng-click=
"rejectApproval()"
>
审核通过
<button
class=
"btn btn-sm"
ng-click=
"rejectApproval()"
>
驳回
</button>
<button
class=
"btn btn-sm"
ng-click=
"agreeApproval()"
>
审核拒绝
<button
class=
"btn btn-sm"
ng-click=
"agreeApproval()"
>
通过
</button>
</td>
</tr>
...
...
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