Skip to content

T
Tia-dev
Commit 101714ff authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

issue tp di excel

See merge request !921
parents e4fda636 72ae8b97
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 101714ff
...@@ -470,6 +470,7 @@ export default class TaxPlanningMR extends Component { ...@@ -470,6 +470,7 @@ export default class TaxPlanningMR extends Component {
"tax_planning": data "tax_planning": data
} }
api.create().validateSubmitReportMRTP(payload).then((response) => { api.create().validateSubmitReportMRTP(payload).then((response) => {
console.log(payload)
console.log(response) console.log(response)
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
...@@ -722,7 +723,7 @@ export default class TaxPlanningMR extends Component { ...@@ -722,7 +723,7 @@ export default class TaxPlanningMR extends Component {
if (tableMeta.rowData[8] == "Corporate Income Tax") { if (tableMeta.rowData[8] == "Corporate Income Tax") {
if (total < 0) { if (total < 0) {
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 { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
} }
...@@ -756,13 +757,13 @@ export default class TaxPlanningMR extends Component { ...@@ -756,13 +757,13 @@ export default class TaxPlanningMR extends Component {
} }
} else { } else {
if (indexChilds == 0) { 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) { 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) { else if (indexChilds == 2) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(val).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(val)
} }
} }
} }
......
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