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

src/container/BudgetTahunan.js

@@ -441,7 +441,7 @@ export default class BudgetTahunan extends Component {
         api.create().approvalSubmission(body).then((res) => {
             // console.log(res)
             // this.setState({ loading: false }, () => {
-                this.getSubmission()
+            this.getSubmission()
             // })
             if (type == 'revision') {
                 api.create().createPeriodeRevision(payload).then((res))
@@ -625,12 +625,12 @@ export default class BudgetTahunan extends Component {
         let array = []
         let canSubmit = true
         this.state.dataTable.map(item => {
-            if (item[1] !== 'Cash Flow') {
-                if (item[3] !== "submitted" && item[3] !== 'approved') {
-                    canSubmit = false
-                    array.push(item[3])
-                }
+            // if (item[1] !== 'Cash Flow') {
+            if (item[3] !== "submitted" && item[3] !== 'approved') {
+                canSubmit = false
+                array.push(item[3])
             }
+            // }
             // if (item[3].includes("not-yet") || item[3].includes("draft")) {
             //     array.push(item[3])
             // } else {

src/container/Laporan/TableSubHolding.js

@@ -310,7 +310,7 @@ export default class TableSubHolding extends Component {
 
                             // }
                             if (forecast != undefined) {
-                                    console.log(dataTable2[indexID][column])
+                                    // console.log(dataTable2[indexID][column])
                             }
                             let valuezz = dataTable2[indexID][column].value == undefined ? dataTable2[indexID][column] : dataTable2[indexID][column].value
                             anjay.push(valuezz == "" ? 0 : valuezz)
@@ -2899,7 +2899,7 @@ export default class TableSubHolding extends Component {
                     <MuiThemeProvider theme={getMuiTheme()}>
                         <MUIDataTable
                             data={dataTable2}
-                            columns={this.props.type === 1 ? columnDBBS : this.props.type === 2 ? columnDBPLDetail : this.props.type === 3 ? columnDBPL : columns}
+                            columns={this.props.type === 2 ? columnDBBS : this.props.type === 1 ? columnDBPLDetail : this.props.type === 3 ? columnDBPL : columns}
                             options={options}
                         />
                     </MuiThemeProvider>