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

src/container/Laporan/SubHolding.js

@@ -3060,6 +3060,8 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 8) {
+            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=1&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+            console.log(url);
             let res = await fetch(
                 `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=1&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
             )

src/container/Laporan/TableSubHolding.js

@@ -13072,7 +13072,7 @@ export default class TableSubHolding extends Component {
                                                             control={
                                                                 <NumberFormat
                                                                     thousandSeparator={true}
-                                                                    style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 70, backgroundColor: 'transparent' }}
+                                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 70, backgroundColor: 'transparent' }}
                                                                     type="text"
                                                                     placeholder=""
                                                                     suffix={`%`}
@@ -13121,7 +13121,7 @@ export default class TableSubHolding extends Component {
                                                             control={
                                                                 <NumberFormat
                                                                     thousandSeparator={true}
-                                                                    style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                     type="text"
                                                                     placeholder=""
                                                                     suffix={'%'}