Skip to content

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

Merge branch 'GGMAC' into 'master' 

update weight Q1

See merge request !1505
parents 7ef4b9a7 5b16695e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ 69f24a3e
......@@ -181,7 +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)
let weight = String(item.corporate_annual_target.weight).includes('%')? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : item.corporate_annual_target.weight
dataTable.push([
item.type_report_id,
item.id,
......@@ -190,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(weight).toFixed(1),
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(Number(weight * 100)).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