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
86a8faee
Commit
86a8faee
authored
Mar 16, 2019
by
kevin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#
parent
c897feee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
TemplateController.java
.../java/pwc/taxtech/atms/controller/TemplateController.java
+0
-1
tax-report-cell-detail-modal.ctrl.js
...rt-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
+3
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateController.java
View file @
86a8faee
...
...
@@ -185,7 +185,6 @@ public class TemplateController extends BaseController {
@RequestParam
(
name
=
"projectId"
)
String
projectId
,
HttpServletResponse
response
)
throws
URISyntaxException
{
period
=
0
;
String
filePath
;
File
templateFile
;
InputStream
inputStream
=
null
;
...
...
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @
86a8faee
...
...
@@ -1536,7 +1536,7 @@
}
,
{
dataField
:
'
A
ttribute'
,
dataField
:
'
a
ttribute'
,
caption
:
$translate
.
instant
(
'Attribute'
),
alignment
:
'left'
}
...
...
@@ -2212,7 +2212,7 @@
$scope
.
detail
.
dataGridSourceBind
=
[
$scope
.
detail
.
dataGridSource
[
0
]];
break
;
case
enums
.
formulaDataSourceType
.
CIT_TBAM
:
$scope
.
detail
.
dataGridSourceBind
=
getBlowGridData
(
$scope
.
detail
.
dataGridSource
[
0
]);
getBlowGridData
(
$scope
.
detail
.
dataGridSource
[
0
]);
break
;
default
:
$scope
.
detail
.
dataGridSourceBind
=
$scope
.
detail
.
dataGridSource
;
...
...
@@ -2236,7 +2236,7 @@
var
getBlowGridData
=
function
(
data
){
cellCommentService
.
getCellInformation
(
data
).
success
(
function
(
res
)
{
if
(
res
.
resultMsg
){
return
res
.
data
;
$scope
.
detail
.
dataGridSourceBind
=
[
res
.
data
[
0
]]
;
}
}).
error
(
function
(
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