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
2026af0f
Commit
2026af0f
authored
Jan 26, 2021
by
Rifka Kurnia
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
push index fr summary See merge request
!1030
parents
42787e27
b93d186b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
index.js
src/api/index.js
+8
-1
SubHolding.js
src/container/Laporan/SubHolding.js
+5
-4
TableSubHolding.js
src/container/Laporan/TableSubHolding.js
+1
-1
No files found.
src/api/index.js
View file @
2026af0f
...
...
@@ -247,6 +247,10 @@ const create = (type = "") => {
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
)
const
getReportCFSuma
=
(
body
)
=>
api
.
post
(
'/transaction/summary_cash_flow/summary/get_report_hierarki'
,
body
)
const
getReportFRMB
=
(
body
)
=>
api
.
post
(
'/transaction/summary_ratio/master_budget/get_report_hierarki'
,
body
)
const
getReportFRMR
=
(
body
)
=>
api
.
post
(
'/transaction/summary_ratio/monthly_report/get_report_hierarki'
,
body
)
const
getReportFRLastMR
=
(
body
)
=>
api
.
post
(
'/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki'
,
body
)
//CASH FLOW
const
getDetailReportCF
=
(
body
)
=>
api
.
post
(
'/transaction/cash_flow/master_budget/get_report_hierarki'
,
body
)
...
...
@@ -602,7 +606,10 @@ const create = (type = "") => {
getReportCFSumaMB
,
getReportCFSumaMR
,
createReportCF
,
getReportCFSuma
getReportCFSuma
,
getReportFRMB
,
getReportFRMR
,
getReportFRLastMR
}
}
...
...
src/container/Laporan/SubHolding.js
View file @
2026af0f
...
...
@@ -1365,9 +1365,10 @@ export default class SubHolding extends Component {
this
.
setState
({
previewTable
:
true
,
loading
:
false
,
previewDownload
:
false
})
})
}
else
if
(
this
.
state
.
report
.
value
===
9
)
{
api
.
create
().
getReportHierarkiFRMB
(
payload
).
then
(
response
=>
{
// console.log(payload);
// console.log(response);
let
paylodFR
=
{...
payload
,
months
:
this
.
state
.
month
.
month_id
}
api
.
create
().
getReportFRMB
(
paylodFR
).
then
(
response
=>
{
console
.
log
(
payload
);
console
.
log
(
response
);
// let dataTable = []
// if (response.data) {
// if (response.data.status === 'success') {
...
...
@@ -1489,7 +1490,7 @@ export default class SubHolding extends Component {
// } else {
// this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
// }
this
.
setState
({
previewTable
:
true
,
loading
:
false
,
previewDownload
:
fals
e
})
this
.
setState
({
previewTable
:
true
,
loading
:
false
,
previewDownload
:
tru
e
})
})
}
...
...
src/container/Laporan/TableSubHolding.js
View file @
2026af0f
...
...
@@ -15774,7 +15774,7 @@ export default class TableSubHolding extends Component {
),
setCellProps: () => ({ style2 }),
customBodyRender: (value, tableMeta, updateValue) => {
console.log(tableMeta)
//
console.log(tableMeta)
return (
<div>
<div className="grid grid-2x content-center">
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