Commit 2af9b4e4 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

Didam

See merge request !1004
parents d9a1f719 afd8c0a8
...@@ -288,6 +288,7 @@ const create = (type = "") => { ...@@ -288,6 +288,7 @@ const create = (type = "") => {
const createMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/create_monthly_report', body) 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 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 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/monthly_report_tp/check_import', body)
const checkUploadMonthlyReportTP = (body) => api.post('transaction/tax_planning/monthly_report/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) const checkUploadMonthlyReportFAM = (body) => api.post('transaction/fam/monthly_report/check_import', body)
...@@ -568,7 +569,8 @@ const create = (type = "") => { ...@@ -568,7 +569,8 @@ const create = (type = "") => {
createPeriodeRevisionMonthly, createPeriodeRevisionMonthly,
getListUserSubcoMB, getListUserSubcoMB,
getListUserSubcoMR, getListUserSubcoMR,
validateSubmitReportFAM validateSubmitReportFAM,
createMonthlyReportCF
} }
} }
......
This diff is collapsed.
...@@ -492,7 +492,7 @@ export default class CashFlowMR extends Component { ...@@ -492,7 +492,7 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} 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> </span>
: :
...@@ -522,7 +522,7 @@ export default class CashFlowMR extends Component { ...@@ -522,7 +522,7 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} 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> <LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -539,7 +539,7 @@ export default class CashFlowMR extends Component { ...@@ -539,7 +539,7 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} 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> </LightTooltip>
: null} : null}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment