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
ee8dc156
Commit
ee8dc156
authored
Nov 23, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'rifka'
# Conflicts: # src/api/index.js
parents
ca52192e
cfeb6572
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
148 additions
and
61 deletions
+148
-61
index.js
src/api/index.js
+4
-3
FixedAssetsMovementMR.js
src/container/MonthlyReport/FixedAssetsMovementMR.js
+144
-58
No files found.
src/api/index.js
View file @
ee8dc156
...
...
@@ -264,8 +264,8 @@ const create = (type = "") => {
const
uploadAttachmentMonthly
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/upload_attachment'
,
body
)
const
deleteAttachmentMonthly
=
(
id
)
=>
api
.
post
(
`transaction/monthly_report/delete_attachment/
${
id
}
`
)
const
createTaxPlanningMR
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_tp/create_monthly_report'
,
body
)
const
getHierarkiMontlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/get_report_hierarki'
,
body
)
// MonthlyPL
const
getHierarkiMontlyReportPL
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_pl/get_report_hierarki'
,
body
)
...
...
@@ -466,7 +466,8 @@ const create = (type = "") => {
getMonthlyReportID
,
getReportHierarkiFR
,
getDetailHierarkiCF
,
getHierarkiMontlyReportPL
getHierarkiMontlyReportPL
,
getHierarkiMontlyReportFAM
}
}
...
...
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @
ee8dc156
...
...
@@ -52,10 +52,11 @@ export default class FixedAssetsMovementMR extends Component {
"periode"
:
this
.
props
.
periode
,
"company_id"
:
this
.
props
.
company
.
company_id
,
"monthly_report_id"
:
this
.
props
.
monthlyReportId
,
"month
"
:
this
.
props
.
month
"month
s"
:
this
.
props
.
month
.
month_id
}
api
.
create
().
getDetailReportMB
(
payload
).
then
(
response
=>
{
// console.log(response);
api
.
create
().
getHierarkiMontlyReportFAM
(
payload
).
then
(
response
=>
{
console
.
log
(
payload
);
console
.
log
(
response
);
let
dataTable
=
[]
if
(
response
.
data
)
{
let
res
=
response
.
data
.
data
...
...
@@ -69,24 +70,17 @@ export default class FixedAssetsMovementMR extends Component {
item
.
formula
,
item
.
level
,
item
.
description
,
item
.
fixed_asset_movement
.
total_actual_before
===
null
?
"0"
:
item
.
fixed_asset_movement
.
total_actual_before
===
""
?
"0"
:
item
.
fixed_asset_movement
.
total_actual_before
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
january
,
formula
:
item
.
fixed_asset_movement
.
january_formula
}
:
item
.
fixed_asset_movement
.
january
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
february
,
formula
:
item
.
fixed_asset_movement
.
february_formula
}
:
item
.
fixed_asset_movement
.
february
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
march
,
formula
:
item
.
fixed_asset_movement
.
march_formula
}
:
item
.
fixed_asset_movement
.
march
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
april
,
formula
:
item
.
fixed_asset_movement
.
april_formula
}
:
item
.
fixed_asset_movement
.
april
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
may
,
formula
:
item
.
fixed_asset_movement
.
may_formula
}
:
item
.
fixed_asset_movement
.
may
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
june
,
formula
:
item
.
fixed_asset_movement
.
june_formula
}
:
item
.
fixed_asset_movement
.
june
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
july
,
formula
:
item
.
fixed_asset_movement
.
july_formula
}
:
item
.
fixed_asset_movement
.
july
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
august
,
formula
:
item
.
fixed_asset_movement
.
august_formula
}
:
item
.
fixed_asset_movement
.
august
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
september
,
formula
:
item
.
fixed_asset_movement
.
september_formula
}
:
item
.
fixed_asset_movement
.
september
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
october
,
formula
:
item
.
fixed_asset_movement
.
october_formula
}
:
item
.
fixed_asset_movement
.
october
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
november
,
formula
:
item
.
fixed_asset_movement
.
november_formula
}
:
item
.
fixed_asset_movement
.
november
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
december
,
formula
:
item
.
fixed_asset_movement
.
december_formula
}
:
item
.
fixed_asset_movement
.
december
,
item
.
fixed_asset_movement
.
total_current_year
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
0
:
item
.
fixed_asset_movement
.
total_next_year
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
0
:
item
.
fixed_asset_movement
.
total_more_year
,
item
.
order
,
item
.
fixed_asset_movement
.
forecast_formula
item
.
fixed_asset_movement
.
mtd_mb
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_mb
,
item
.
fixed_asset_movement
.
mtd_rb
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_rb
,
item
.
fixed_asset_movement
.
mtd_actual
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_actual
,
item
.
fixed_asset_movement
.
act_previous_month
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_previous_month
,
item
.
fixed_asset_movement
.
act_vs_prev_month_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_prev_month_amount
,
item
.
fixed_asset_movement
.
act_vs_prev_month_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_prev_month_percent
,
item
.
fixed_asset_movement
.
act_vs_mb_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_mb_amount
,
item
.
fixed_asset_movement
.
act_vs_mb_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_mb_percent
,
item
.
fixed_asset_movement
.
act_vs_rb_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_rb_amount
,
item
.
fixed_asset_movement
.
act_vs_rb_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_rb_percent
,
item
.
order
])
}
if
(
item
.
children
!==
null
)
{
...
...
@@ -105,24 +99,18 @@ export default class FixedAssetsMovementMR extends Component {
item
.
formula
,
item
.
level
,
item
.
description
,
item
.
fixed_asset_movement
.
total_actual_before
===
null
?
"0"
:
item
.
fixed_asset_movement
.
total_actual_before
===
""
?
"0"
:
item
.
fixed_asset_movement
.
total_actual_before
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
january
,
formula
:
item
.
fixed_asset_movement
.
january_formula
}
:
item
.
fixed_asset_movement
.
january
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
february
,
formula
:
item
.
fixed_asset_movement
.
february_formula
}
:
item
.
fixed_asset_movement
.
february
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
march
,
formula
:
item
.
fixed_asset_movement
.
march_formula
}
:
item
.
fixed_asset_movement
.
march
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
april
,
formula
:
item
.
fixed_asset_movement
.
april_formula
}
:
item
.
fixed_asset_movement
.
april
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
may
,
formula
:
item
.
fixed_asset_movement
.
may_formula
}
:
item
.
fixed_asset_movement
.
may
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
june
,
formula
:
item
.
fixed_asset_movement
.
june_formula
}
:
item
.
fixed_asset_movement
.
june
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
july
,
formula
:
item
.
fixed_asset_movement
.
july_formula
}
:
item
.
fixed_asset_movement
.
july
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
august
,
formula
:
item
.
fixed_asset_movement
.
august_formula
}
:
item
.
fixed_asset_movement
.
august
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
september
,
formula
:
item
.
fixed_asset_movement
.
september_formula
}
:
item
.
fixed_asset_movement
.
september
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
october
,
formula
:
item
.
fixed_asset_movement
.
october_formula
}
:
item
.
fixed_asset_movement
.
october
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
november
,
formula
:
item
.
fixed_asset_movement
.
november_formula
}
:
item
.
fixed_asset_movement
.
november
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
{
value
:
item
.
fixed_asset_movement
.
december
,
formula
:
item
.
fixed_asset_movement
.
december_formula
}
:
item
.
fixed_asset_movement
.
december
,
item
.
fixed_asset_movement
.
total_current_year
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
0
:
item
.
fixed_asset_movement
.
total_next_year
,
item
.
type_report_id
==
5
||
item
.
type_report_id
==
6
?
0
:
item
.
fixed_asset_movement
.
total_more_year
,
item
.
order
,
item
.
fixed_asset_movement
.
forecast_formula
item
.
fixed_asset_movement
.
mtd_mb
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_mb
,
item
.
fixed_asset_movement
.
mtd_rb
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_rb
,
item
.
fixed_asset_movement
.
mtd_actual
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
mtd_actual
,
item
.
fixed_asset_movement
.
act_previous_month
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_previous_month
,
item
.
fixed_asset_movement
.
act_vs_prev_month_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_prev_month_amount
,
item
.
fixed_asset_movement
.
act_vs_prev_month_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_prev_month_percent
,
item
.
fixed_asset_movement
.
act_vs_mb_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_mb_amount
,
item
.
fixed_asset_movement
.
act_vs_mb_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_mb_percent
,
item
.
fixed_asset_movement
.
act_vs_rb_amount
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_rb_amount
,
item
.
fixed_asset_movement
.
act_vs_rb_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_rb_percent
,
item
.
ordert_vs_rb_percent
===
""
?
"0.0"
:
item
.
fixed_asset_movement
.
act_vs_rb_percent
,
item
.
order
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
...
...
@@ -132,6 +120,7 @@ export default class FixedAssetsMovementMR extends Component {
}
}
})
console
.
log
(
dataTable
);
this
.
setState
({
dataTable
,
loading
:
false
,
buttonError
:
true
,
editable
:
true
})
}
else
{
this
.
setState
({
dataTable
,
loading
:
false
,
buttonError
:
true
,
editable
:
true
})
...
...
@@ -140,8 +129,38 @@ export default class FixedAssetsMovementMR extends Component {
}
render
()
{
// let dataTable2 = this.state.dataTable
const
columns
=
[{
let
columns
=
[
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
"Account"
,
options
:
{
customHeadRender
:
(
columnMeta
)
=>
(
...
...
@@ -209,17 +228,26 @@ export default class FixedAssetsMovementMR extends Component {
<
div
className
=
"grid grid-3x content-center"
>
<
div
className
=
"col-1"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
a
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
6
]
}
<
/div
>
<
/div
>
<
div
className
=
"col-2"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
b
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
7
]
}
<
/div
>
<
/div
>
<
div
className
=
"col-3"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
c
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
8
]
}
<
/div
>
<
/div
>
<
/div
>
...
...
@@ -239,7 +267,12 @@ export default class FixedAssetsMovementMR extends Component {
customBodyRender
:
(
val
,
tableMeta
,
updateValue
)
=>
{
return
(
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
0
]
===
6
?
tableMeta
.
rowData
[
9
]
:
null
}
<
/div
>
)
}
...
...
@@ -302,12 +335,18 @@ export default class FixedAssetsMovementMR extends Component {
<
div
className
=
"grid grid-2x content-center"
>
<
div
className
=
"col-1"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
a
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
10
]
}
<
/div
>
<
/div
>
<
div
className
=
"col-2"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
b
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
11
]
}
<
/div
>
<
/div
>
<
/div
>
...
...
@@ -316,12 +355,18 @@ export default class FixedAssetsMovementMR extends Component {
<
div
className
=
"grid grid-2x content-center"
>
<
div
className
=
"col-1"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
c
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
12
]
}
<
/div
>
<
/div
>
<
div
className
=
"col-2"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
d
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
13
]
}
<
/div
>
<
/div
>
<
/div
>
...
...
@@ -330,12 +375,18 @@ export default class FixedAssetsMovementMR extends Component {
<
div
className
=
"grid grid-2x content-center"
>
<
div
className
=
"col-1"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
e
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
14
]
}
<
/div
>
<
/div
>
<
div
className
=
"col-2"
>
<
div
style
=
{{
textAlign
:
'right'
,
width
:
90
}}
>
{
val
.
f
}
{
tableMeta
.
rowData
[
0
]
===
1
?
null
:
tableMeta
.
rowData
[
15
]
}
<
/div
>
<
/div
>
<
/div
>
...
...
@@ -345,12 +396,47 @@ export default class FixedAssetsMovementMR extends Component {
)
}
}
}
]
let
data
=
[
[
"Total Assets"
,
{
a
:
"2"
,
b
:
"3"
,
c
:
"4"
},
"5"
,
{
a
:
"6"
,
b
:
"7"
,
c
:
"8"
,
d
:
"9"
,
e
:
"10"
,
f
:
"11"
}],
[
"Total Assets"
,
{
a
:
"12"
,
b
:
"13"
,
c
:
"14"
},
"15"
,
{
a
:
"16"
,
b
:
"17"
,
c
:
"18"
,
d
:
"19"
,
e
:
"110"
,
f
:
"111"
}]
]
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
}]
return
(
<
div
style
=
{{
height
:
this
.
props
.
height
,
backgroundColor
:
'#f8f8f8'
,
marginBottom
:
100
,
minHeight
:
1000
}}
>
...
...
@@ -420,7 +506,7 @@ export default class FixedAssetsMovementMR extends Component {
<
div
style
=
{{
marginTop
:
20
,
width
:
this
.
props
.
width
-
(
this
.
props
.
open
===
true
?
400
:
150
)
}}
>
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
data
=
{
data
}
data
=
{
this
.
state
.
dataTable
}
columns
=
{
columns
}
options
=
{
options
}
/
>
...
...
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