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
5cd6d168
Commit
5cd6d168
authored
Jan 08, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into didam
parents
65a9e327
101714ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
index.js
src/api/index.js
+8
-4
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+5
-4
No files found.
src/api/index.js
View file @
5cd6d168
...
...
@@ -265,7 +265,8 @@ const create = (type = "") => {
// const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
const
getHierarkiMontlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/locf/monthly_report/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/get_report_hierarki'
,
body
)
// const getHierarkiMontlyReportFAM = (body) => api.post('transaction/fam/monthly_report/get_report_hierarki', body)
const
getHierarkiMontlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportCF
=
(
body
)
=>
api
.
post
(
'transaction/cash_flow/monthly_report/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportCAT
=
(
body
)
=>
api
.
post
(
'/transaction/cat/monthly_report/get_report_hierarki'
,
body
)
const
getLastPeriodMonthly
=
(
idCompany
)
=>
api
.
get
(
`transaction/monthly_report/get_last_periode/
${
idCompany
}
`
)
...
...
@@ -280,19 +281,22 @@ const create = (type = "") => {
const
createMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/locf/monthly_report/create_monthly_report'
,
body
)
// const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
const
createMonthlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/create_monthly_report'
,
body
)
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
createMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/create_monthly_report'
,
body
)
const
createMonthlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/create_monthly_report'
,
body
)
const
createMonthlyReportCAT
=
(
body
)
=>
api
.
post
(
'transaction/cat/monthly_report/create_monthly_report'
,
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
checkUploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/check_import'
,
body
)
// const checkUploadMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/check_import', body)
const
checkUploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/check_import'
,
body
)
// const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
const
checkUploadMonthlyReportBS
=
(
body
)
=>
api
.
post
(
'transaction/balance_sheet/monthly_report/check_import'
,
body
)
const
checkUploadMonthlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/check_import'
,
body
)
const
checkUploadMonthlyReportCAT
=
(
body
)
=>
api
.
post
(
'transaction/cat/monthly_report/check_import'
,
body
)
// const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
const
uploadMonthlyReportBS
=
(
body
)
=>
api
.
post
(
'transaction/balance_sheet/monthly_report/import_monthly_report'
,
body
)
const
uploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/fam/monthly_report/import_monthly_report'
,
body
)
// const uploadMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/import_monthly_report', body)
const
uploadMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/import_monthly_report'
,
body
)
// const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/import_monthly_report', body)
const
uploadMonthlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/import_monthly_report'
,
body
)
const
uploadMonthlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/import_monthly_report'
,
body
)
...
...
src/container/MonthlyReport/TaxPlanningMR.js
View file @
5cd6d168
...
...
@@ -470,6 +470,7 @@ export default class TaxPlanningMR extends Component {
"tax_planning"
:
data
}
api
.
create
().
validateSubmitReportMRTP
(
payload
).
then
((
response
)
=>
{
console
.
log
(
payload
)
console
.
log
(
response
)
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
...
...
@@ -722,7 +723,7 @@ export default class TaxPlanningMR extends Component {
if
(
tableMeta
.
rowData
[
8
]
==
"Corporate Income Tax"
)
{
if
(
total
<
0
)
{
total
=
0
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
).
toFixed
(
2
)
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
).
toFixed
(
2
)
}
...
...
@@ -756,13 +757,13 @@ export default class TaxPlanningMR extends Component {
}
}
else
{
if
(
indexChilds
==
0
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbc
=
Number
(
val
)
.
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbc
=
Number
(
val
)
}
else
if
(
indexChilds
==
1
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
fcp
=
Number
(
val
)
.
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
fcp
=
Number
(
val
)
}
else
if
(
indexChilds
==
2
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
val
)
.
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
val
)
}
}
}
...
...
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