Skip to content

T
Tia-dev
Commit e0a0a2b8 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 8f69a044 9d14684a
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ e0a0a2b8
......@@ -702,7 +702,7 @@ export default class OperatingIndicatorMR extends Component {
})
let a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total)
console.log(tableMeta.columnIndex + type)
return a
}
......@@ -850,25 +850,25 @@ export default class OperatingIndicatorMR extends Component {
value={Number(handleValue(tableMeta, 0)).toFixed(1)}
/>
</span> :
tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={tableMeta.rowData[7]}
decimalScale={1}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)}
/>
}
/>
</div>
:
// tableMeta.rowData[0] === 6 ?
// <div style={{ flex: 1 }}>
// <FormControlLabel
// style={{ margin: 0 }}
// value={tableMeta.rowData[7]}
// decimalScale={1}
// control={
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)}
// />
// }
// />
// </div>
// :
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
......@@ -952,25 +952,25 @@ export default class OperatingIndicatorMR extends Component {
decimalScale={1}
/>
</span>
:
tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={ Number(tableMeta.rowData[8]).toFixed(1)}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
decimalScale={1}
/>
}
/>
</div>
// :
// tableMeta.rowData[0] === 6 ?
// <div style={{ flex: 1 }}>
// <FormControlLabel
// style={{ margin: 0 }}
// value={ Number(tableMeta.rowData[8]).toFixed(1)}
// control={
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
// decimalScale={1}
// />
// }
// />
// </div>
:
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -1019,25 +1019,25 @@ export default class OperatingIndicatorMR extends Component {
decimalScale={1}
/>
</span>
:
tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={tableMeta.rowData[9]}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
decimalScale={1}
/>
}
/>
</div>
// :
// tableMeta.rowData[0] === 6 ?
// <div style={{ flex: 1 }}>
// <FormControlLabel
// style={{ margin: 0 }}
// value={tableMeta.rowData[9]}
// control={
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// disabled={true}
// value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
// decimalScale={1}
// />
// }
// />
// </div>
:
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -1125,7 +1125,7 @@ export default class OperatingIndicatorMR extends Component {
placeholder=""
disabled={true}
decimalScale={1}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
value={Number(handleFormula(val, tableMeta, 2)).toFixed(1)}
decimalScale={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