Skip to content

T
Tia-dev
Commit 91921e1d authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'GGMAC' into 'master' 

update cat

See merge request !1489
parents 652aacaa 0169e9f3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ 91921e1d
......@@ -149,7 +149,7 @@ export default class CorporateAnnualTargetRO extends Component {
item.formula,
item.level,
item.description,
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(item.corporate_annual_target.weight).toFixed(1),
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
parentTrue ? item.corporate_annual_target.uom : item.uom,
parentTrue ? item.corporate_annual_target.kpi == "" ? null : { value: item.corporate_annual_target.kpi } : item.kpi_type == "" ? null : { value: item.kpi_type },
parentTrue ? item.corporate_annual_target.max_ach == "" ? null : { value: titleCase(item.corporate_annual_target.max_ach) } : item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
......@@ -181,6 +181,7 @@ export default class CorporateAnnualTargetRO extends Component {
}
}
res.map((item, index) => {
let weight = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
dataTable.push([
item.type_report_id,
item.id,
......@@ -189,7 +190,7 @@ export default class CorporateAnnualTargetRO extends Component {
item.level,
item.description,
// item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(item.corporate_annual_target.weight).toFixed(1),
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
item.corporate_annual_target.uom,
item.kpi_type == "" ? null : { value: item.kpi_type },
item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
......
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