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

src/api/index.js

@@ -245,7 +245,7 @@ const create = (type = "") => {
   const getRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/get_report_hierarki', body)
   const createRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/create_rolling_outlook', body)
   const getRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/get_report_hierarki', body)
-
+  const getRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/get_report_hierarki', body)
 
   //REPORT NEW
   const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
@@ -699,6 +699,7 @@ const create = (type = "") => {
     getRollingOutlookID,
     getRollingOutlookBS,
     createRollingOutlookBS,
+    getRollingOutlookTP,
     getAllMasterDataCat,
     getParentItemReport,
     saveMasterDataCat,

src/container/BudgetTahunan.js

@@ -1657,7 +1657,7 @@ export default class BudgetTahunan extends Component {
             "months": 0,
         }
         // console.log(this.state.dbCF)
-        console.log(JSON.stringify(payload))
+        // console.log(JSON.stringify(payload))
         api.create().createReportPLMB(payload).then((res) => {
             console.log(res)
             this.setState({ loading: false })
@@ -1962,7 +1962,7 @@ export default class BudgetTahunan extends Component {
     }
 
     approvalSubmission(type) {
-        this.scrollToMyRef()
+        // this.scrollToMyRef()
         this.setState({ loading: true }, () => {
             document.body.style.overflow = 'hidden';
         })
@@ -2233,7 +2233,7 @@ export default class BudgetTahunan extends Component {
     }
 
     validateRevision() {
-        this.scrollToMyRef()
+        // this.scrollToMyRef()
         let arrayRevisi = this.state.detailRevisiCheck
         let remarksKosong = 0
         arrayRevisi.map((item, index) => {

src/container/RollingOutlook.js

@@ -327,7 +327,7 @@ export default class RollingOutlook extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
-                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod))
+                    let index = data.sort((a, b) => a - b).findIndex((val) => val === (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.latestPeriode))
                     // console.log(data)
                     console.log(this.state.lastPeriod)
                     // console.log(periodeData)
@@ -1241,6 +1241,7 @@ export default class RollingOutlook extends Component {
                         onClickClose={() => this.setState({ visibleTP: false, visibleRollingOutlook: true })}
                         status={this.state.status}
                         lastStatus={this.state.lastStatus}
+                        isApprover={'false'}
                     />
                 )}