Commit 3ec76a6a authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

aman

See merge request !359
parents 842274e1 f6ccfa17
...@@ -113,7 +113,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -113,7 +113,7 @@ export default class CorporateAnnualTarget extends Component {
item.level, item.level,
"", "",
item.description, item.description,
item.type_report_id == 1? `${Number(item.weight) * 100}%` : (String(item.cat.weight).includes('%')? `${Number(String(item.cat.weight).replace('%', '')) * 100}%` : `${Number(item.cat.weight) * 100}%`), item.type_report_id == 1? `${Number(item.weight) * 100}%` : item.cat.weight,
item.cat.uom, item.cat.uom,
item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type}, item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type},
item.cat.max_ach == "" ? null : {value: item.cat.max_ach}, item.cat.max_ach == "" ? null : {value: item.cat.max_ach},
...@@ -155,7 +155,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -155,7 +155,7 @@ export default class CorporateAnnualTarget extends Component {
item.level, item.level,
"", "",
item.description, item.description,
item.type_report_id == 1? `${Number(item.weight) * 100}%` : (String(item.cat.weight).includes('%')? `${Number(String(item.cat.weight).replace('%', '')) * 100}%` : `${Number(item.cat.weight) * 100}%`), item.type_report_id == 1? `${Number(item.weight) * 100}%` : item.cat.weight,
item.cat.uom, item.cat.uom,
item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type}, item.cat.kpi_type == "" ? null : {value: item.cat.kpi_type},
item.cat.max_ach == "" ? null : {value: item.cat.max_ach}, item.cat.max_ach == "" ? null : {value: item.cat.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