Commit 2741c98f authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-dev(pc)' into 'master'

ro

See merge request !451
parents 2c1142fb 72266f36
......@@ -2,17 +2,13 @@ import React, { Component } from 'react';
import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel } from '@material-ui/core';
import MUIDataTable from 'mui-datatables';
import Images from '../assets/Images';
import BalanceSheet from './BudgetTahunan/BalanceSheet';
import api from '../api';
import Autocomplete from '@material-ui/lab/Autocomplete';
import { titleCase } from '../library/Utils';
import ProfitLoss from './BudgetTahunan/ProfitLoss';
import TaxPlanning from './BudgetTahunan/TaxPlanning';
import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
import { ExcelRenderer } from 'react-excel-renderer';
import UploadFile from "../library/Upload";
import { format } from 'date-fns';
import BalanceSheetRO from './RollingOutlook/BalanceSheetRO';
export default class RollingOutlook extends Component {
constructor(props) {
......@@ -285,9 +281,9 @@ export default class RollingOutlook extends Component {
<div style={{ display: 'flex' }}>
{val === "submitted" || val === "approved" ?
<img src={Images.ceklis} style={{ width: 31, height: 24 }} /> :
val === "revision" ?
<span>Revisi</span> :
null
val === "revision" ?
<span>Revisi</span> :
null
}
</div >
);
......@@ -522,6 +518,14 @@ export default class RollingOutlook extends Component {
</div>
</div>
)}
{this.state.visibleBS && (
<BalanceSheetRO
width={this.props.width}
open={this.props.open}
onClickClose={() => this.setState({ visibleBS: false, visibleRollingOutlook: true })}
/>
)}
</div >
);
}
......
This diff is collapsed.
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