Merge branch 'GGMAC' into 'master'

update weight Q1

See merge request !1505

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -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) },