Skip to content

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

Merge branch 'GGMAC' into 'master' 

issue oi

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