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
c59bd822
Commit
c59bd822
authored
Jan 25, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
3243d475
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
9 deletions
+37
-9
index.js
src/api/index.js
+2
-2
BudgetTahunan.js
src/container/BudgetTahunan.js
+19
-5
MonthlyReport.js
src/container/MonthlyReport.js
+16
-2
No files found.
src/api/index.js
View file @
c59bd822
...
...
@@ -244,8 +244,8 @@ const create = (type = "") => {
const
getReportTPMR
=
(
body
)
=>
api
.
post
(
'/transaction/db_tax_planning/monthly_report/get_report_hierarki'
,
body
)
const
getReportOIMB
=
(
body
)
=>
api
.
post
(
'/transaction/db_operating_indicator/master_budget/get_report_hierarki'
,
body
)
const
getReportOIMR
=
(
body
)
=>
api
.
post
(
'/transaction/db_operating_indicator/monthly_report/get_report_hierarki'
,
body
)
const
getReportCFSumaMB
=
(
body
)
=>
api
.
post
(
'/transaction/
db
_cash_flow/master_budget/get_report_hierarki'
,
body
)
const
getReportCFSumaMR
=
(
body
)
=>
api
.
post
(
'/transaction/
db
_cash_flow/monthly_report/get_report_hierarki'
,
body
)
const
getReportCFSumaMB
=
(
body
)
=>
api
.
post
(
'/transaction/
summary
_cash_flow/master_budget/get_report_hierarki'
,
body
)
const
getReportCFSumaMR
=
(
body
)
=>
api
.
post
(
'/transaction/
summary
_cash_flow/monthly_report/get_report_hierarki'
,
body
)
//CASH FLOW
const
getDetailReportCF
=
(
body
)
=>
api
.
post
(
'/transaction/cash_flow/master_budget/get_report_hierarki'
,
body
)
...
...
src/container/BudgetTahunan.js
View file @
c59bd822
...
...
@@ -278,11 +278,18 @@ export default class BudgetTahunan extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
let
dataTable
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
let
indexC
=
String
(
item
.
current_status
).
toLocaleUpperCase
().
indexOf
(
'C'
)
let
status_approv
=
''
if
(
String
(
item
.
current_status
).
toLocaleUpperCase
().
includes
(
'CC'
))
{
status_approv
=
`
${
String
(
item
.
current_status
).
substr
(
0
,
indexC
)}${
String
(
item
.
current_status
).
substr
(
indexC
+
1
,
String
(
item
.
current_status
).
length
)}
`
}
else
{
status_approv
=
String
(
item
.
current_status
)
}
return
[
item
.
number
,
item
.
report_name
===
'CAT'
?
'Corporate Annual Target'
:
item
.
report_name
,
item
.
revision
,
this
.
state
.
lastStatus
===
'APPROVED'
?
'CLOSED'
:
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
current_status
,
this
.
state
.
lastStatus
===
'APPROVED'
?
'CLOSED'
:
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
status_approv
,
item
.
report_id
,
Number
(
item
.
revision
)
>
0
?
(
item
.
current_status
==
"not-yet"
?
false
:
item
.
is_can_upload
)
:
item
.
is_can_upload
,
item
.
revision
...
...
@@ -1039,9 +1046,9 @@ export default class BudgetTahunan extends Component {
// console.log(listCF)
this
.
setState
({
dbCF
:
listCF
}
,
()
=>
{
if
(
this
.
state
.
company
.
company_id
==
'13467'
)
{
this
.
createCashFlow
()
}
//
if (this.state.company.company_id == '13467') {
//
this.createCashFlow()
//
}
if
(
type
!=
undefined
)
{
if
(
type
==
'BS'
||
type
==
'FAM'
||
type
==
'PL'
)
{
console
.
log
(
'tarik sis'
)
...
...
@@ -1090,9 +1097,16 @@ export default class BudgetTahunan extends Component {
// // // console.log(response);
if
(
response
.
data
.
data
.
length
>
0
)
{
let
dataTableHistory
=
response
.
data
.
data
.
map
(
item
=>
{
let
indexC
=
String
(
item
.
status_approval
).
toLocaleUpperCase
().
indexOf
(
'C'
)
let
status_approv
=
''
if
(
String
(
item
.
status_approval
).
toLocaleUpperCase
().
includes
(
'CC'
))
{
status_approv
=
`
${
String
(
item
.
status_approval
).
substr
(
0
,
indexC
)}${
String
(
item
.
status_approval
).
substr
(
indexC
+
1
,
String
(
item
.
status_approval
).
length
)}
`
}
else
{
status_approv
=
String
(
item
.
status_approval
)
}
return
[
item
.
pic
,
item
.
status_approval
,
status_approv
,
item
.
remarks
,
item
.
item_revision
,
item
.
history_approval_date
...
...
src/container/MonthlyReport.js
View file @
c59bd822
...
...
@@ -217,11 +217,18 @@ export default class MonthlyReport extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
let
dataTable
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
let
indexC
=
String
(
item
.
current_status
).
toLocaleUpperCase
().
indexOf
(
'C'
)
let
status_approv
=
''
if
(
String
(
item
.
current_status
).
toLocaleUpperCase
().
includes
(
'CC'
))
{
status_approv
=
`
${
String
(
item
.
current_status
).
substr
(
0
,
indexC
)}${
String
(
item
.
current_status
).
substr
(
indexC
+
1
,
String
(
item
.
current_status
).
length
)}
`
}
else
{
status_approv
=
String
(
item
.
current_status
)
}
return
[
item
.
number
,
item
.
report_name
==
"CAT"
?
"Corporate Annual Target"
:
item
.
report_name
,
item
.
revision
,
this
.
state
.
isApprovedMB
?
(
this
.
state
.
lastStatus
===
'APPROVED'
?
'CLOSED'
:
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
current_status
)
:
"CLOSED"
,
this
.
state
.
isApprovedMB
?
(
this
.
state
.
lastStatus
===
'APPROVED'
?
'CLOSED'
:
this
.
state
.
isSubmit
===
false
?
"CLOSED"
:
item
.
status_approv
)
:
"CLOSED"
,
item
.
report_id
,
item
.
is_can_upload
,
item
.
revision
...
...
@@ -661,9 +668,16 @@ export default class MonthlyReport extends Component {
if
(
response
.
data
.
data
)
{
if
(
response
.
data
.
data
.
length
>
0
)
{
let
dataTableHistory
=
response
.
data
.
data
.
map
(
item
=>
{
let
indexC
=
String
(
item
.
status_approval
).
toLocaleUpperCase
().
indexOf
(
'C'
)
let
status_approv
=
''
if
(
String
(
item
.
status_approval
).
toLocaleUpperCase
().
includes
(
'CC'
))
{
status_approv
=
`
${
String
(
item
.
status_approval
).
substr
(
0
,
indexC
)}${
String
(
item
.
status_approval
).
substr
(
indexC
+
1
,
String
(
item
.
status_approval
).
length
)}
`
}
else
{
status_approv
=
String
(
item
.
status_approval
)
}
return
[
item
.
pic
,
item
.
status_approval
,
status_approv
,
item
.
remarks
,
item
.
item_revision
,
item
.
history_approval_date
...
...
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