mabok

src/container/BudgetTahunan/BudgetTahunan.js

@@ -2752,9 +2752,9 @@ export default class BudgetTahunan extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        tableMeta.rowData[5] == true ?
+                                        // tableMeta.rowData[5] == true ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                            : null
+                                            // : null
                                     }
                                 >
                                     {/* {this.state.isApprover == true ?

src/container/MonthlyReport/TaxPlanningMR.js

@@ -882,12 +882,16 @@ export default class TaxPlanningMR extends Component {
             console.log(dataTable2)
         }
         const handleTotal = (value, tableMeta, dex) => {
-            // console.log(tableMeta)
             let total = 0
             dataTable2[tableMeta.rowIndex].map((item, index) => {
                 if (index == 9) {
                     let valItemTBF = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf
                     total = Number(tableMeta.rowData[16]) + Number(valItemTBF)
+                    if (tableMeta.rowData[8] == "Revenue") {
+                        console.log(valItemTBF);
+                        console.log(Number(tableMeta.rowData[16]));
+                        console.log(total);
+                    }
                 }
             })
 
@@ -897,7 +901,7 @@ export default class TaxPlanningMR extends Component {
 
         const handleParent = (tableMeta, type) => {
             let total = 0
-            console.log("tes parent");
+            // console.log("tes parent");
             dataTable2.map((item, index) => {
                 if (item[5] == tableMeta.rowData[4]) {
                     total += Number(type == 1 ?
@@ -1443,7 +1447,7 @@ export default class TaxPlanningMR extends Component {
                                                             type="text"
                                                             placeholder=""
                                                             disabled={true}
-                                                            value={Number(tableMeta.rowData[16]) == 0 ? "0.0" :  this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))}
+                                                            value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))}
                                                         />
                                                     }
                                                 />