Merge branch 'didam' into 'master'

tyty

See merge request !578

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -516,15 +516,19 @@ export default class BalanceSheet extends Component {
                     arrayFormulaConvert.push(item)
                 } else {
                     let indexID = dataTable2.findIndex((val) => val[21] == item)
+                    // console.log(item)
+                    // console.log(indexID)
                     if (indexID !== -1) {
                         let valuezz = dataTable2[indexID][tableMeta.columnIndex]
                         // // console.log(dataTable2[indexID])
                         arrayFormulaConvert.push(valuezz == "" ? 0 : valuezz)
+                    } else {
+                        arrayFormulaConvert.push(Number(item))
                     }
                 }
             })
-            // // console.log(arrayFormula)
-            // // console.log(arrayFormulaConvert)
+            // console.log(arrayFormula)
+            // console.log(arrayFormulaConvert)
             let array = arrayFormulaConvert
             let total = 0
             let opt = ""
@@ -547,7 +551,7 @@ export default class BalanceSheet extends Component {
                     } else if (opt == "bagi") {
                         total = Number(total) / Number(item)
                     } else {
-                        total += item
+                        total += Number(item)
                     }
                 }
             })