Skip to content

T
Tia-dev
Commit 7a914cd6 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

apdet yuk

See merge request !889
parents 398d15f3 e2edebad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 120 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 7a914cd6
......@@ -627,7 +627,8 @@ export default class FixedAssetsMovementMR extends Component {
}
const handleChange = (value, tableMeta, type) => {
dataTable2[tableMeta.rowIndex][type] = value
let val = String(value).split(",").join("")
dataTable2[tableMeta.rowIndex][type] = val
// console.log(dataTable2)
// console.log(dataTable2[tableMeta.rowIndex][type]);
// console.log(value);
......@@ -696,7 +697,7 @@ export default class FixedAssetsMovementMR extends Component {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// console.log(total);
}
return total
return total * 100
}
let columns = [
......@@ -885,7 +886,7 @@ export default class FixedAssetsMovementMR extends Component {
}
/>
</div> :
tableMeta.rowData[0] === 5 ?
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6?
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
......@@ -1099,7 +1100,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(1)}
value={Number(Number(tableMeta.rowData[11]) * 100).toFixed(1)}
/>
}
/>
......@@ -1143,7 +1144,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(1)}
value={Number(Number(tableMeta.rowData[12]) * 100).toFixed(1)}
/>
}
/>
......@@ -1182,7 +1183,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(1)}
value={Number(Number(tableMeta.rowData[13]) * 100).toFixed(1)}
/>
}
/>
......
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