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
a02ecab2
Commit
a02ecab2
authored
Aug 22, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
542416fd
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
659 additions
and
659 deletions
+659
-659
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+42
-49
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+604
-600
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+13
-10
No files found.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
a02ecab2
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/ProfitLoss.js
View file @
a02ecab2
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/TaxPlanning.js
View file @
a02ecab2
...
...
@@ -808,6 +808,7 @@ export default class TaxPlanning extends Component {
})
}
})
let body = {
company_id: this.props.company.company_id,
periode: this.props.periode,
...
...
@@ -815,6 +816,7 @@ export default class TaxPlanning extends Component {
tax_planning: payload,
status: 'submitted'
}
// console.log(body);
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
}
});
...
...
@@ -955,6 +957,7 @@ export default class TaxPlanning extends Component {
item.error
]
})
console.log(dataTable);
this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, saveDraft: true }, () => {
this.state.dataTable.map(item => {
if (item[27].length > 0) {
...
...
@@ -1941,22 +1944,21 @@ export default class TaxPlanning extends Component {
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 9 && index <= 20) {
if
(
this
.
props
.
status
===
'CLOSED'
)
{
let
indexChild
=
item
.
tbf
if
(
indexChild
!==
-
1
)
{
total
+=
Number
(
item
.
tbf
)
}
}
else
{
//
if (this.props.status === 'CLOSED') {
//
let indexChild = item.tbf
//
if (indexChild !== -1) {
//
total += Number(item.tbf)
//
}
//
} else {
let indexChild = item.tbf.formula.findIndex((val) => val.periode === periode)
if (indexChild !== -1) {
total += Number(item.tbf.formula[indexChild].value)
}
}
//
}
}
})
let nilai = Number(total) + Number(dataTable2[88][21])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = nilai
// console.log(nilai);
return nilai
}
...
...
@@ -8399,7 +8401,8 @@ export default class TaxPlanning extends Component {
null
:
tableMeta.rowData[3] === 7 ?
(
Number
(
this
.
props
.
status
===
'CLOSED'
?
Number
(
value
).
toFixed
(
1
)
:
handleTotal
(
tableMeta
,
1
))
>=
Number
(
this
.
state
.
minValue
)
&&
Number
(
this
.
props
.
status
===
'CLOSED'
?
Number
(
value
).
toFixed
(
1
)
:
handleTotal
(
tableMeta
,
1
))
<=
Number
(
this
.
state
.
maxValue
))
?
// (Number(this.props.status === 'CLOSED' ? Number(value).toFixed(1) : handleTotal(tableMeta, 1)) >= Number(this.state.minValue) && Number(this.props.status === 'CLOSED' ? Number(value).toFixed(1) : handleTotal(tableMeta, 1)) <= Number(this.state.maxValue)) ?
(Number(handleTotal(tableMeta, 1)) >= Number(this.state.minValue) && Number(handleTotal(tableMeta, 1)) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
...
...
@@ -10131,7 +10134,7 @@ export default class TaxPlanning extends Component {
result={this.state.result}
acceptedFiles={["xlsx"]}
onHandle={(dt) => {
this
.
fileHandler
(
dt
)
this.fileHandler
Simulasi
(dt)
this.setState({ uploadStatus: 'idle', percentage: '0' })
}}
onUpload={() => {
...
...
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