Skip to content

T
Tia-dev
Commit 2e268180 authored by r.kurnia's avatar r.kurnia
Browse files
Options

to fixed 3 fam conflict

parents 8e76c767 5c653379
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 27 deletions
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ 2e268180
...@@ -183,8 +183,6 @@ export default class FixedAssetsMovement extends Component { ...@@ -183,8 +183,6 @@ export default class FixedAssetsMovement extends Component {
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false}) this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
} }
console.log(dataTable);
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
} }
...@@ -686,9 +684,9 @@ export default class FixedAssetsMovement extends Component { ...@@ -686,9 +684,9 @@ export default class FixedAssetsMovement extends Component {
const handleTotal = (tableMeta) => { const handleTotal = (tableMeta) => {
let total = 0 let total = 0
// console.log(tableMeta) // console.log(tableMeta)
if (tableMeta.rowData[5] == 'Beginning balance') { // if (tableMeta.rowData[5] == 'Beginning balance') {
console.log(tableMeta.rowData) // console.log(tableMeta.rowData)
} // }
if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance') { if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance') {
total = dataTable2[tableMeta.rowIndex][18].value total = dataTable2[tableMeta.rowIndex][18].value
dataTable2[tableMeta.rowIndex][19] = total dataTable2[tableMeta.rowIndex][19] = total
...@@ -2335,28 +2333,6 @@ export default class FixedAssetsMovement extends Component { ...@@ -2335,28 +2333,6 @@ export default class FixedAssetsMovement extends Component {
null null
: :
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> </div>
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment