Merge branch 'dev-riri' into 'ENV-DEV'

update

See merge request !2186

src/container/MonthlyReport/LOCFMR.js

@@ -555,8 +555,8 @@ export default class LOCF extends Component {
 
                     let lastArray = dataTable[dataTable.length - 1]
                     this.setState({ dataTable, diff: lastArray[46], perBS: lastArray[47], dataLoaded: true, loading: false, buttonError: false, dataDelete: [] }, () => {
-                        console.log(lastArray);
-                        this.props.sendToParent(dataTable, lastArray , 'LOCF', 'upload')
+                        console.log(this.state.visibleLOCFMR);
+                        this.props.sendToParent(dataTable, lastArray , 'LOCF', 'upload', this.state.visibleLOCFMR)
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, typeAlert: 'warning', loading: false }, () => {
@@ -3592,7 +3592,7 @@ export default class LOCF extends Component {
                                     <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
                                 </div>
                                 <div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
-                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > 0 ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
+                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
                                 </div>
                             </div>
                         </div>