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
2af9b4e4
Commit
2af9b4e4
authored
Jan 20, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
Didam See merge request
!1004
parents
d9a1f719
afd8c0a8
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
365 additions
and
5 deletions
+365
-5
index.js
src/api/index.js
+3
-1
MonthlyReport.js
src/container/MonthlyReport.js
+359
-1
CashFlowMR.js
src/container/MonthlyReport/CashFlowMR.js
+3
-3
No files found.
src/api/index.js
View file @
2af9b4e4
...
@@ -288,6 +288,7 @@ const create = (type = "") => {
...
@@ -288,6 +288,7 @@ const create = (type = "") => {
const
createMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportCAT
=
(
body
)
=>
api
.
post
(
'transaction/cat/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportCAT
=
(
body
)
=>
api
.
post
(
'transaction/cat/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportCF
=
(
body
)
=>
api
.
post
(
'transaction/cash_flow/monthly_report/create_monthly_report'
,
body
)
// const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
// const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
const
checkUploadMonthlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/check_import'
,
body
)
const
checkUploadMonthlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/check_import'
,
body
)
const
checkUploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/check_import'
,
body
)
const
checkUploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/check_import'
,
body
)
...
@@ -568,7 +569,8 @@ const create = (type = "") => {
...
@@ -568,7 +569,8 @@ const create = (type = "") => {
createPeriodeRevisionMonthly
,
createPeriodeRevisionMonthly
,
getListUserSubcoMB
,
getListUserSubcoMB
,
getListUserSubcoMR
,
getListUserSubcoMR
,
validateSubmitReportFAM
validateSubmitReportFAM
,
createMonthlyReportCF
}
}
}
}
...
...
src/container/MonthlyReport.js
View file @
2af9b4e4
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/CashFlowMR.js
View file @
2af9b4e4
...
@@ -492,7 +492,7 @@ export default class CashFlowMR extends Component {
...
@@ -492,7 +492,7 @@ export default class CashFlowMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
value
=
{
this
.
props
.
status
==
'approved'
?
Number
(
tableMeta
.
rowData
[
6
].
value
)
:
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
/
>
/
>
<
/span>
<
/span>
:
:
...
@@ -522,7 +522,7 @@ export default class CashFlowMR extends Component {
...
@@ -522,7 +522,7 @@ export default class CashFlowMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
value
=
{
this
.
props
.
status
==
'approved'
?
Number
(
tableMeta
.
rowData
[
6
].
value
)
:
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
/>
:
/>
:
<
LightTooltip
title
=
{
this
.
state
.
minValue
===
null
?
null
:
`Value Should be (
${
this
.
state
.
minValue
}
) up to (
${
this
.
state
.
maxValue
}
)`
}
arrow
>
<
LightTooltip
title
=
{
this
.
state
.
minValue
===
null
?
null
:
`Value Should be (
${
this
.
state
.
minValue
}
) up to (
${
this
.
state
.
maxValue
}
)`
}
arrow
>
<
NumberFormat
<
NumberFormat
...
@@ -539,7 +539,7 @@ export default class CashFlowMR extends Component {
...
@@ -539,7 +539,7 @@ export default class CashFlowMR extends Component {
type
=
"text"
type
=
"text"
placeholder
=
""
placeholder
=
""
disabled
=
{
true
}
disabled
=
{
true
}
value
=
{
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
value
=
{
this
.
props
.
status
==
'approved'
?
Number
(
tableMeta
.
rowData
[
6
].
value
)
:
Number
(
handleValueFormula
(
tableMeta
,
6
)).
toFixed
(
1
)}
/
>
/
>
<
/LightTooltip
>
<
/LightTooltip
>
:
null
}
:
null
}
...
...
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