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
f5210e5b
Commit
f5210e5b
authored
Jun 18, 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
b011f42c
1c488e3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
MonthlyReport.js
src/container/MonthlyReport.js
+12
-4
TaxPlanningRO.js
src/container/RollingOutlook/TaxPlanningRO.js
+1
-1
No files found.
src/container/MonthlyReport.js
View file @
f5210e5b
...
@@ -632,7 +632,6 @@ export default class MonthlyReport extends Component {
...
@@ -632,7 +632,6 @@ export default class MonthlyReport extends Component {
}
else
{
}
else
{
this
.
setState
({
loading
:
false
})
this
.
setState
({
loading
:
false
})
}
}
// this.getFR(type)
// this.getFR(type)
// this.getReport()
// this.getReport()
// this.getReportAttachment()
// this.getReportAttachment()
...
@@ -1505,6 +1504,7 @@ export default class MonthlyReport extends Component {
...
@@ -1505,6 +1504,7 @@ export default class MonthlyReport extends Component {
}
}
}
}
})
})
console
.
log
(
JSON
.
stringify
(
dataTable
))
console
.
log
(
dataTable
)
console
.
log
(
dataTable
)
this
.
setState
({
dbPL
:
dataTable
},
()
=>
{
this
.
setState
({
dbPL
:
dataTable
},
()
=>
{
this
.
olahDataPL
(
this
.
state
.
dbPL
,
type
)
this
.
olahDataPL
(
this
.
state
.
dbPL
,
type
)
...
@@ -2164,16 +2164,20 @@ export default class MonthlyReport extends Component {
...
@@ -2164,16 +2164,20 @@ export default class MonthlyReport extends Component {
borderColor
:
'transparent'
borderColor
:
'transparent'
}}
}}
onClick
=
{()
=>
onClick
=
{()
=>
this
.
state
.
periode
.
periode
<=
2020
?
this
.
clickDetail
(
tableMeta
.
rowData
[
1
],
tableMeta
.
rowData
[
4
],
tableMeta
.
rowData
[
2
],
tableMeta
.
rowData
[
3
])
:
// {
// {
tableMeta
.
rowData
[
5
]
?
(
tableMeta
.
rowData
[
5
]
?
this
.
clickDetail
(
tableMeta
.
rowData
[
1
],
tableMeta
.
rowData
[
4
],
tableMeta
.
rowData
[
2
],
tableMeta
.
rowData
[
3
])
this
.
clickDetail
(
tableMeta
.
rowData
[
1
],
tableMeta
.
rowData
[
4
],
tableMeta
.
rowData
[
2
],
tableMeta
.
rowData
[
3
])
:
null
:
null
)
// console.log(tableMeta.rowData)
// console.log(tableMeta.rowData)
// }
// }
}
}
>
>
<
Typography
style
=
{{
color
:
tableMeta
.
rowData
[
5
]
?
'#5198ea'
:
'GrayText'
,
fontSize
:
12
,
}}
>
Detail
<
/Typography
>
<
Typography
style
=
{{
color
:
t
his
.
state
.
periode
.
periode
<=
2020
||
t
ableMeta
.
rowData
[
5
]
?
'#5198ea'
:
'GrayText'
,
fontSize
:
12
,
}}
>
Detail
<
/Typography
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
);
);
...
@@ -2952,6 +2956,8 @@ export default class MonthlyReport extends Component {
...
@@ -2952,6 +2956,8 @@ export default class MonthlyReport extends Component {
onClickClose
=
{()
=>
this
.
setState
({
visibleCAT
:
false
,
visibleMonthlyReport
:
true
})}
onClickClose
=
{()
=>
this
.
setState
({
visibleCAT
:
false
,
visibleMonthlyReport
:
true
})}
isApprover
=
{
this
.
state
.
isApprover
}
isApprover
=
{
this
.
state
.
isApprover
}
status
=
{
this
.
state
.
status
}
status
=
{
this
.
state
.
status
}
// status={'not-yet'}
// lastStatus={'SUBMIT'}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
/
>
/
>
...
@@ -3007,10 +3013,12 @@ export default class MonthlyReport extends Component {
...
@@ -3007,10 +3013,12 @@ export default class MonthlyReport extends Component {
month
=
{
this
.
state
.
month
}
month
=
{
this
.
state
.
month
}
onClickClose
=
{()
=>
this
.
setState
({
visibleCF
:
false
,
visibleMonthlyReport
:
true
})}
onClickClose
=
{()
=>
this
.
setState
({
visibleCF
:
false
,
visibleMonthlyReport
:
true
})}
status
=
{
this
.
state
.
status
}
status
=
{
this
.
state
.
status
}
// status={'not-yet'}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
isApprover
=
{
this
.
state
.
isApprover
}
isApprover
=
{
this
.
state
.
isApprover
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
PLBSFAMSubmitted
=
{
this
.
state
.
lastStatus
==
'APPROVED'
?
true
:
false
}
// PLBSFAMSubmitted={false}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
/
>
/
>
)}
)}
...
...
src/container/RollingOutlook/TaxPlanningRO.js
View file @
f5210e5b
...
@@ -334,7 +334,7 @@ export default class TaxPlanning extends Component {
...
@@ -334,7 +334,7 @@ export default class TaxPlanning extends Component {
fcp
:
i
[
2
]
===
3
&&
i
[
10
].
fcp
===
""
?
"0"
:
i
[
2
]
===
5
||
i
[
2
]
===
6
||
i
[
2
]
===
7
?
String
(
i
[
10
].
fcp
.
value
)
:
String
(
i
[
10
].
fcp
),
fcp
:
i
[
2
]
===
3
&&
i
[
10
].
fcp
===
""
?
"0"
:
i
[
2
]
===
5
||
i
[
2
]
===
6
||
i
[
2
]
===
7
?
String
(
i
[
10
].
fcp
.
value
)
:
String
(
i
[
10
].
fcp
),
tbf
:
i
[
3
]
===
3
&&
i
[
10
].
tbf
===
""
?
"0"
:
i
[
3
]
===
5
||
i
[
3
]
===
6
||
i
[
3
]
===
7
?
String
(
i
[
10
].
tbf
.
value
)
:
String
(
i
[
10
].
tbf
)
tbf
:
i
[
3
]
===
3
&&
i
[
10
].
tbf
===
""
?
"0"
:
i
[
3
]
===
5
||
i
[
3
]
===
6
||
i
[
3
]
===
7
?
String
(
i
[
10
].
tbf
.
value
)
:
String
(
i
[
10
].
tbf
)
},
},
mar
et
:
{
mar
ch
:
{
tbc
:
i
[
1
]
===
3
&&
i
[
11
].
tbc
===
""
?
"0"
:
i
[
1
]
===
5
||
i
[
1
]
===
6
||
i
[
1
]
===
7
?
String
(
i
[
11
].
tbc
.
value
)
:
String
(
i
[
11
].
tbc
),
tbc
:
i
[
1
]
===
3
&&
i
[
11
].
tbc
===
""
?
"0"
:
i
[
1
]
===
5
||
i
[
1
]
===
6
||
i
[
1
]
===
7
?
String
(
i
[
11
].
tbc
.
value
)
:
String
(
i
[
11
].
tbc
),
fcp
:
i
[
2
]
===
3
&&
i
[
11
].
fcp
===
""
?
"0"
:
i
[
2
]
===
5
||
i
[
2
]
===
6
||
i
[
2
]
===
7
?
String
(
i
[
11
].
fcp
.
value
)
:
String
(
i
[
11
].
fcp
),
fcp
:
i
[
2
]
===
3
&&
i
[
11
].
fcp
===
""
?
"0"
:
i
[
2
]
===
5
||
i
[
2
]
===
6
||
i
[
2
]
===
7
?
String
(
i
[
11
].
fcp
.
value
)
:
String
(
i
[
11
].
fcp
),
tbf
:
i
[
3
]
===
3
&&
i
[
11
].
tbf
===
""
?
"0"
:
i
[
3
]
===
5
||
i
[
3
]
===
6
||
i
[
3
]
===
7
?
String
(
i
[
11
].
tbf
.
value
)
:
String
(
i
[
11
].
tbf
)
tbf
:
i
[
3
]
===
3
&&
i
[
11
].
tbf
===
""
?
"0"
:
i
[
3
]
===
5
||
i
[
3
]
===
6
||
i
[
3
]
===
7
?
String
(
i
[
11
].
tbf
.
value
)
:
String
(
i
[
11
].
tbf
)
...
...
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