Merge branch 'dev/riri' into 'ENV-DEV'

Update terbaru

See merge request !1996

src/container/BudgetTahunan/BalanceSheet.js

@@ -393,7 +393,7 @@ export default class BalanceSheet extends Component {
                     balance_sheet: payload,
                     status: 'submitted'
                 }
-                // console.log(body)
+                console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
             }
         });
@@ -440,6 +440,7 @@ export default class BalanceSheet extends Component {
                             item.error
                         ]
                     })
+                    console.log(dataTable);
                     this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, errorPreview: false, saveDraft: true }, () => {
                         this.state.dataTable.map(item => {
                             if (item[26].length > 0) {
@@ -1125,7 +1126,7 @@ export default class BalanceSheet extends Component {
                                                         type="text"
                                                         placeholder=""
                                                         disabled={this.props.isApprover == true ? true : ((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
-                                                        value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? fixNumber(Number(value.value), 1) : fixNumber(Number(handleValueFormula(value, tableMeta)), 1)) : (String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? Number(value.value) : Number(handleValueFormula(value, tableMeta)))}
+                                                        value={this.props.defaultCurrency.id == 1 ? String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? fixNumber(Number(value.value), 1) : fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? Number(value.value) : Number(handleValueFormula(value, tableMeta))}
                                                         onBlur={(event) => {
                                                             handleChange(event.target.value, tableMeta, 'r/e')
                                                             // console.log(dataTable2)

src/container/MonthlyReport/BalanceSheetMR.js

@@ -66,7 +66,7 @@ export default class BalanceSheetMR extends Component {
     componentDidMount() {
         this.getSettingControl()
         this.getLatestUpdate()
-        // this.handleViewOnly()
+        this.handleViewOnly()
     }
 
     handleViewOnly() {

src/container/MonthlyReport/CashFlowMR.js

@@ -97,7 +97,7 @@ export default class CashFlowMR extends Component {
     componentDidMount() {
         // this.getItemHierarki()
         console.log(this.props.PLBSFAMSubmitted)
-        // this.handleViewOnly()
+        this.handleViewOnly()
         this.getSettingControl()
     }
 

src/container/MonthlyReport/MonthlyReport.js

@@ -2565,9 +2565,9 @@ export default class MonthlyReport extends Component {
                                             :
 
                                             // {
-                                            // (tableMeta.rowData[5] ?
+                                            (tableMeta.rowData[5] ?
                                                 this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                                // : null)
+                                                : null)
                                         // console.log(tableMeta.rowData)
                                         // }