Skip to content

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

Merge branch 'didam' into 'master' 

apdet

See merge request !884
parents 0cb33513 836b73d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 125 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ cbe17f11
...@@ -951,17 +951,17 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -951,17 +951,17 @@ export default class FixedAssetsMovementMR extends Component {
} }
/> />
: :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? // tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> // <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(handleValueFormula(tableMeta, 9)).toFixed(1)} // value={Number(handleValueFormula(tableMeta, 9)).toFixed(1)}
/> // />
</span> : // </span> :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
......
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