Skip to content

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

Merge branch 'didam' into 'master' 

tyty

See merge request !578
parents 73779c44 b86a5ebd
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @ fbcd6d55
...@@ -516,15 +516,19 @@ export default class BalanceSheet extends Component { ...@@ -516,15 +516,19 @@ export default class BalanceSheet extends Component {
arrayFormulaConvert.push(item) arrayFormulaConvert.push(item)
} else { } else {
let indexID = dataTable2.findIndex((val) => val[21] == item) let indexID = dataTable2.findIndex((val) => val[21] == item)
// console.log(item)
// console.log(indexID)
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = dataTable2[indexID][tableMeta.columnIndex] let valuezz = dataTable2[indexID][tableMeta.columnIndex]
// // console.log(dataTable2[indexID]) // // console.log(dataTable2[indexID])
arrayFormulaConvert.push(valuezz == "" ? 0 : valuezz) arrayFormulaConvert.push(valuezz == "" ? 0 : valuezz)
} else {
arrayFormulaConvert.push(Number(item))
} }
} }
}) })
// // console.log(arrayFormula) // console.log(arrayFormula)
// // console.log(arrayFormulaConvert) // console.log(arrayFormulaConvert)
let array = arrayFormulaConvert let array = arrayFormulaConvert
let total = 0 let total = 0
let opt = "" let opt = ""
...@@ -547,7 +551,7 @@ export default class BalanceSheet extends Component { ...@@ -547,7 +551,7 @@ export default class BalanceSheet extends Component {
} else if (opt == "bagi") { } else if (opt == "bagi") {
total = Number(total) / Number(item) total = Number(total) / Number(item)
} else { } else {
total += item total += Number(item)
} }
} }
}) })
......
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