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
2e268180
Commit
2e268180
authored
Dec 01, 2020
by
r.kurnia
Browse files
Options
Browse Files
Download
Plain Diff
to fixed 3 fam conflict
parents
8e76c767
5c653379
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
27 deletions
+3
-27
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+3
-27
No files found.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
2e268180
...
...
@@ -183,8 +183,6 @@ export default class FixedAssetsMovement extends Component {
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
,
loading
:
false
})
}
console
.
log
(
dataTable
);
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
,
loading
:
false
})
}
...
...
@@ -686,9 +684,9 @@ export default class FixedAssetsMovement extends Component {
const
handleTotal
=
(
tableMeta
)
=>
{
let
total
=
0
// console.log(tableMeta)
if
(
tableMeta
.
rowData
[
5
]
==
'Beginning balance'
)
{
console
.
log
(
tableMeta
.
rowData
)
}
//
if (tableMeta.rowData[5] == 'Beginning balance') {
//
console.log(tableMeta.rowData)
//
}
if
(
String
(
tableMeta
.
rowData
[
5
]).
toLocaleLowerCase
()
==
'ending balance'
)
{
total
=
dataTable2
[
tableMeta
.
rowIndex
][
18
].
value
dataTable2
[
tableMeta
.
rowIndex
][
19
]
=
total
...
...
@@ -2335,28 +2333,6 @@ export default class FixedAssetsMovement extends Component {
null
:
null
// tableMeta.rowData[0] === 2 ?
// <span style={{ fontSize: 12, textAlign: 'right' }}>
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(handleValue(tableMeta)).toFixed(3)}
// />
// </span>
// :
// <span style={{ fontSize: 12, textAlign: 'right' }}>
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(handleTotal(tableMeta)).toFixed(3)}
// />
// </span>
}
<
/div
>
)
...
...
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