Merge branch 'rifka' into 'master'

issue tp di excel

See merge request !921

src/container/MonthlyReport/TaxPlanningMR.js

@@ -470,6 +470,7 @@ export default class TaxPlanningMR extends Component {
             "tax_planning": data
         }
         api.create().validateSubmitReportMRTP(payload).then((response) => {
+            console.log(payload)
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
@@ -722,7 +723,7 @@ export default class TaxPlanningMR extends Component {
                 if (tableMeta.rowData[8] == "Corporate Income Tax") {
                     if (total < 0) {
                         total = 0
-                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1)
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
                     } else {
                         dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
                     }
@@ -756,13 +757,13 @@ export default class TaxPlanningMR extends Component {
                 }
             } else {
                 if (indexChilds == 0) {
-                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = Number(val).toFixed(1)
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = Number(val)
                 }
                 else if (indexChilds == 1) {
-                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = Number(val).toFixed(1)
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = Number(val)
                 }
                 else if (indexChilds == 2) {
-                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(val).toFixed(1)
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(val)
                 }
             }
         }