Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
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
Dida Adams Arizona
Tia-dev
Commits
67aeec3d
Commit
67aeec3d
authored
Jan 04, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
32322226
b16b9314
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
341 additions
and
174 deletions
+341
-174
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+30
-20
FixedAssetsMovementMR.js
src/container/MonthlyReport/FixedAssetsMovementMR.js
+7
-6
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+239
-94
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+65
-54
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
67aeec3d
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @
67aeec3d
...
@@ -627,7 +627,8 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -627,7 +627,8 @@ export default class FixedAssetsMovementMR extends Component {
}
}
const
handleChange
=
(
value
,
tableMeta
,
type
)
=>
{
const
handleChange
=
(
value
,
tableMeta
,
type
)
=>
{
dataTable2
[
tableMeta
.
rowIndex
][
type
]
=
value
let
val
=
String
(
value
).
split
(
","
).
join
(
""
)
dataTable2
[
tableMeta
.
rowIndex
][
type
]
=
val
// console.log(dataTable2)
// console.log(dataTable2)
// console.log(dataTable2[tableMeta.rowIndex][type]);
// console.log(dataTable2[tableMeta.rowIndex][type]);
// console.log(value);
// console.log(value);
...
@@ -696,7 +697,7 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -696,7 +697,7 @@ export default class FixedAssetsMovementMR extends Component {
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
Number
(
total
).
toFixed
(
1
)
// console.log(total);
// console.log(total);
}
}
return
total
return
total
*
100
}
}
let
columns
=
[
let
columns
=
[
...
@@ -885,7 +886,7 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -885,7 +886,7 @@ export default class FixedAssetsMovementMR extends Component {
}
}
/
>
/
>
<
/div>
:
<
/div>
:
tableMeta
.
rowData
[
0
]
===
5
?
tableMeta
.
rowData
[
0
]
===
5
||
tableMeta
.
rowData
[
0
]
===
6
?
<
span
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
}}
>
<
span
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
}}
>
<
NumberFormat
<
NumberFormat
thousandSeparator
=
{
true
}
thousandSeparator
=
{
true
}
...
@@ -1099,7 +1100,7 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -1099,7 +1100,7 @@ export default class FixedAssetsMovementMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
11
]
).
toFixed
(
1
)}
value
=
{
Number
(
Number
(
tableMeta
.
rowData
[
11
])
*
100
).
toFixed
(
1
)}
/
>
/
>
}
}
/
>
/
>
...
@@ -1143,7 +1144,7 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -1143,7 +1144,7 @@ export default class FixedAssetsMovementMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
12
]
).
toFixed
(
1
)}
value
=
{
Number
(
Number
(
tableMeta
.
rowData
[
12
])
*
100
).
toFixed
(
1
)}
/
>
/
>
}
}
/
>
/
>
...
@@ -1182,7 +1183,7 @@ export default class FixedAssetsMovementMR extends Component {
...
@@ -1182,7 +1183,7 @@ export default class FixedAssetsMovementMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
13
]
).
toFixed
(
1
)}
value
=
{
Number
(
Number
(
tableMeta
.
rowData
[
13
])
*
100
).
toFixed
(
1
)}
/
>
/
>
}
}
/
>
/
>
...
...
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
67aeec3d
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/TaxPlanningMR.js
View file @
67aeec3d
This diff is collapsed.
Click to expand it.
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