Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -113,7 +113,7 @@ export default class CorporateAnnualTarget extends Component {
                         item.level,
                         "",
                         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.kpi_type == "" ? null : {value: item.cat.kpi_type},
                         item.cat.max_ach == "" ? null : {value: item.cat.max_ach},
@@ -155,7 +155,7 @@ export default class CorporateAnnualTarget extends Component {
                     item.level,
                     "",
                     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.kpi_type == "" ? null : {value: item.cat.kpi_type},
                     item.cat.max_ach == "" ? null : {value: item.cat.max_ach},

src/container/BudgetTahunan/ProfitLoss.js

@@ -459,12 +459,12 @@ export default class ProfitLoss extends Component {
         const handleTotal = (tableMeta) => {
             let total = 0
             dataTable2[tableMeta.rowIndex].map((item, index) => {
-                if (index >= 7 && index <= 18) {
+                if (index >= 8 && index <= 19) {
                     let valItem = item == undefined || item == "" ? 0 : item
                     total += Number(valItem)
                 }
             })
-            dataTable2[tableMeta.rowIndex][19] = total
+            dataTable2[tableMeta.rowIndex][20] = total
             return total
             // console.log(total);
         }