Commit 0169e9f3 authored by d.arizona's avatar d.arizona

update cat

parent 652aacaa
...@@ -149,7 +149,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -149,7 +149,7 @@ export default class CorporateAnnualTargetRO extends Component {
item.formula, item.formula,
item.level, item.level,
item.description, 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.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.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) }, 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 { ...@@ -181,6 +181,7 @@ export default class CorporateAnnualTargetRO extends Component {
} }
} }
res.map((item, index) => { res.map((item, index) => {
let weight = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
dataTable.push([ dataTable.push([
item.type_report_id, item.type_report_id,
item.id, item.id,
...@@ -189,7 +190,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -189,7 +190,7 @@ export default class CorporateAnnualTargetRO extends Component {
item.level, item.level,
item.description, item.description,
// item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1), // 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.corporate_annual_target.uom,
item.kpi_type == "" ? null : { value: item.kpi_type }, item.kpi_type == "" ? null : { value: item.kpi_type },
item.max_ach == "" ? null : { value: titleCase(item.max_ach) }, 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