Merge branch 'didam' into 'master'

Didam

See merge request !1004

src/api/index.js

@@ -288,6 +288,7 @@ const create = (type = "") => {
   const createMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/create_monthly_report', body)
   const createMonthlyReportOI = (body) => api.post('transaction/operating_indicator/monthly_report/create_monthly_report', body)
   const createMonthlyReportCAT = (body) => api.post('transaction/cat/monthly_report/create_monthly_report', body)
+  const createMonthlyReportCF = (body) => api.post('transaction/cash_flow/monthly_report/create_monthly_report', body)
   // const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
   const checkUploadMonthlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/check_import', body)
@@ -568,7 +569,8 @@ const create = (type = "") => {
     createPeriodeRevisionMonthly,
     getListUserSubcoMB,
     getListUserSubcoMR,
-    validateSubmitReportFAM
+    validateSubmitReportFAM,
+    createMonthlyReportCF
   }
 }
 

src/container/MonthlyReport/CashFlowMR.js

@@ -492,7 +492,7 @@ export default class CashFlowMR extends Component {
                                             type="text"
                                             placeholder=""
                                             disabled={true}
-                                            value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                            value={this.props.status == 'approved'? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                         />
                                     </span> 
                                     :
@@ -522,7 +522,7 @@ export default class CashFlowMR extends Component {
                                                 type="text"
                                                 placeholder=""
                                                 disabled={true}
-                                                value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                value={this.props.status == 'approved'? Number(tableMeta.rowData[6].value) :Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                             /> :
                                             <LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
                                                 <NumberFormat
@@ -539,7 +539,7 @@ export default class CashFlowMR extends Component {
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
-                                                    value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
+                                                    value={this.props.status == 'approved'? Number(tableMeta.rowData[6].value) :Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
                                                 />
                                             </LightTooltip>
                                         : null}