Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into deni-dev(pc)

src/container/BudgetTahunan/TaxPlanning.js

@@ -6209,17 +6209,14 @@ export default class TaxPlanning extends Component {
             name: `${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
-                    <div style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
-                        {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
-                            <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
-                        </TableCell> */}
+                    <th  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
                         <div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingTop: 8 }}>{columnMeta.name}</div>
-                        <div style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}>
-                            <div style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
+                        <div className="" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}>
+                            <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Trial Balance (Fiscal)"}</span>
                             </div>
                         </div>
-                    </div>
+                    </th>
                 ),
                 setCellProps: () => ({ style2 }),
                 customBodyRender: (value, tableMeta, updateValue) => {

src/container/OprIndicator/OperatingIndicator.js

@@ -240,6 +240,7 @@ export default class OperatingIndicator extends Component {
                         options: periodeData,
                         getOptionLabel: (option) => option.periode,
                     };
+                    console.log(defaultProps)
                     let periode = (this.state.lastPeriod == "" ? String(Number(currentYear) + 1) : this.state.lastPeriod)
                     let index = data.sort((a, b) => a - b).findIndex((val) => val === periode)
                     this.setState({ listPeriode: defaultProps, periode: index == -1 ? periodeData[0] : periodeData[index] }, () => {
@@ -554,13 +555,13 @@ export default class OperatingIndicator extends Component {
                                         </MuiThemeProvider>
                                     </div>
                                 </div>
-                                {this.state.isSubmit && (
+                                {/* {this.state.isSubmit && (
                                     <div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
                                         <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
                                             <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Submit</Typography>
                                         </div>
                                     </div>
-                                )}
+                                )} */}
                             </Paper>
 
                         </div>