Skip to content

T
Tia-dev
Commit c69b2c5c 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 80c7dec5 ac4ec3f5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 642 additions and 168 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ c69b2c5c
...@@ -73,7 +73,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -73,7 +73,7 @@ export default class CorporateAnnualTargetMR extends Component {
} }
componentDidMount() { componentDidMount() {
this.getItemHierarki() // this.getItemHierarki()
this.getLatestUpdate() this.getLatestUpdate()
this.getKPIType() this.getKPIType()
this.getMaxAch() this.getMaxAch()
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ c69b2c5c
...@@ -805,7 +805,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -805,7 +805,7 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 5 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -827,7 +827,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -827,7 +827,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={Number(tableMeta.rowData[6]).toFixed(1)}
/> />
} }
/> />
...@@ -840,7 +840,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -840,7 +840,7 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 5?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -862,7 +862,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -862,7 +862,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={Number(tableMeta.rowData[7]).toFixed(1)}
/> />
} }
/> />
...@@ -896,7 +896,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -896,7 +896,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
/> />
</div> : </div> :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 5 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -918,7 +918,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -918,7 +918,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={Number(tableMeta.rowData[8]).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