Skip to content

T
Tia-dev
Commit 699fb585 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'rifka' into 'master' 

last issue tolong

See merge request !719
parents aa481418 8d843dc4
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 699fb585
...@@ -1140,8 +1140,7 @@ export default class TaxPlanning extends Component { ...@@ -1140,8 +1140,7 @@ export default class TaxPlanning extends Component {
} }
total = R.equals(total, NaN) ? "0.0" : total total = R.equals(total, NaN) ? "0.0" : total
// console.log(tableMeta.rowData[8]) // if (tableMeta.rowData[8] == "Corporate Income Tax") {
// if (xntd !== undefined && tableMeta.rowData[8] == "Under payment /(Over Payment ) Income Tax Art. 29") {
// console.log(tableMeta.rowData[8]) // console.log(tableMeta.rowData[8])
// // console.log(splitFormula) // // console.log(splitFormula)
// console.log(xntd) // console.log(xntd)
...@@ -1149,6 +1148,7 @@ export default class TaxPlanning extends Component { ...@@ -1149,6 +1148,7 @@ export default class TaxPlanning extends Component {
// console.log(anjay) // console.log(anjay)
// console.log(total) // console.log(total)
// console.log(total2) // console.log(total2)
// }
// console.log(opt) // console.log(opt)
// } // }
...@@ -1170,10 +1170,11 @@ export default class TaxPlanning extends Component { ...@@ -1170,10 +1170,11 @@ export default class TaxPlanning extends Component {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1)
} else { } else {
if (tableMeta.rowData[8] == "Corporate Income Tax") { if (tableMeta.rowData[8] == "Corporate Income Tax") {
if (Number(dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value) < 0) { if (total < 0) {
total = 0 total = 0
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(2)
} }
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
...@@ -1245,6 +1246,7 @@ export default class TaxPlanning extends Component { ...@@ -1245,6 +1246,7 @@ export default class TaxPlanning extends Component {
} }
const handleChange = (value, tableMeta, indexChilds) => { const handleChange = (value, tableMeta, indexChilds) => {
// console.log(dataTable2)
let val = String(value).split(",").join("") let val = String(value).split(",").join("")
// let data = this.state.dataTable2 // let data = this.state.dataTable2
let indexParent = dataTable2.findIndex((val) => val[4] === dataTable2[tableMeta.rowIndex][5]) let indexParent = dataTable2.findIndex((val) => val[4] === dataTable2[tableMeta.rowIndex][5])
......
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