Skip to content

T
Tia-dev
Commit 920b76d6 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

view oi pl

See merge request !876
parents 458d3a57 b58df44f
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 6 deletions
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 920b76d6
...@@ -739,6 +739,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -739,6 +739,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? val :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -779,6 +780,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -779,6 +780,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(val).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -867,6 +869,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -867,6 +869,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[8]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -883,7 +886,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -883,7 +886,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={tableMeta.rowData[8]} value={ Number(tableMeta.rowData[8]).toFixed(1)}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -908,7 +911,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -908,7 +911,7 @@ export default class OperatingIndicatorMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[8]} value={Number(tableMeta.rowData[8]).toFixed(1)}
/> />
} }
/> />
...@@ -920,6 +923,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -920,6 +923,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[9]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -953,7 +957,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -953,7 +957,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={tableMeta.rowData[9]} value={ Number(tableMeta.rowData[9]).toFixed(1)}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -961,7 +965,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -961,7 +965,7 @@ export default class OperatingIndicatorMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[9]} value={ Number(tableMeta.rowData[9]).toFixed(1)}
/> />
} }
/> />
...@@ -974,6 +978,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -974,6 +978,7 @@ export default class OperatingIndicatorMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[10]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -990,7 +995,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -990,7 +995,7 @@ export default class OperatingIndicatorMR extends Component {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={tableMeta.rowData[10]} value={Number(tableMeta.rowData[10]).toFixed(1)}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1096,6 +1101,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1096,6 +1101,7 @@ export default class OperatingIndicatorMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[11]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1120,6 +1126,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1120,6 +1126,7 @@ export default class OperatingIndicatorMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[12]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1149,6 +1156,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1149,6 +1156,7 @@ export default class OperatingIndicatorMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[13]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1173,6 +1181,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1173,6 +1181,7 @@ export default class OperatingIndicatorMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[14]).toFixed(1) :
<div style={{ flex: 1, width: 120 }}> <div style={{ flex: 1, width: 120 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1251,6 +1260,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1251,6 +1260,7 @@ export default class OperatingIndicatorMR extends Component {
<div className="col-1"> <div className="col-1">
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? null : {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[15] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} // value={value}
...@@ -1303,6 +1313,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1303,6 +1313,7 @@ export default class OperatingIndicatorMR extends Component {
<div className="col-2"> <div className="col-2">
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? null : {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[16] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} // value={value}
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 920b76d6
...@@ -889,6 +889,7 @@ export default class ProfitLossMR extends Component { ...@@ -889,6 +889,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right' }}> <div style={{ textAlign: 'right' }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[6] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={tableMeta.rowData[6]} // value={tableMeta.rowData[6]}
...@@ -933,6 +934,7 @@ export default class ProfitLossMR extends Component { ...@@ -933,6 +934,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1?
null null
: :
this.state.get_for == 'view' ? tableMeta.rowData[7] :
tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
...@@ -1010,6 +1012,7 @@ export default class ProfitLossMR extends Component { ...@@ -1010,6 +1012,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[8]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1063,6 +1066,7 @@ export default class ProfitLossMR extends Component { ...@@ -1063,6 +1066,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[9]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1115,6 +1119,7 @@ export default class ProfitLossMR extends Component { ...@@ -1115,6 +1119,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[10]).toFixed(1) :
tableMeta.rowData[0] === 3 ? tableMeta.rowData[0] === 3 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
...@@ -1214,6 +1219,7 @@ export default class ProfitLossMR extends Component { ...@@ -1214,6 +1219,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[11]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1230,7 +1236,7 @@ export default class ProfitLossMR extends Component { ...@@ -1230,7 +1236,7 @@ export default class ProfitLossMR extends Component {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={tableMeta.rowData[11]} value={Number(tableMeta.rowData[11]).toFixed(1)}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1280,6 +1286,7 @@ export default class ProfitLossMR extends Component { ...@@ -1280,6 +1286,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null : null :
this.state.get_for == 'view' ? Number(tableMeta.rowData[12]).toFixed(1) :
tableMeta.rowData[0] === 2 ? tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1399,6 +1406,7 @@ export default class ProfitLossMR extends Component { ...@@ -1399,6 +1406,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[13]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1423,6 +1431,7 @@ export default class ProfitLossMR extends Component { ...@@ -1423,6 +1431,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[14]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1453,6 +1462,7 @@ export default class ProfitLossMR extends Component { ...@@ -1453,6 +1462,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[15]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1477,6 +1487,7 @@ export default class ProfitLossMR extends Component { ...@@ -1477,6 +1487,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[16]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1506,6 +1517,7 @@ export default class ProfitLossMR extends Component { ...@@ -1506,6 +1517,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[17]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1530,6 +1542,7 @@ export default class ProfitLossMR extends Component { ...@@ -1530,6 +1542,7 @@ export default class ProfitLossMR extends Component {
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
: :
this.state.get_for == 'view' ? Number(tableMeta.rowData[18]).toFixed(1) :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1625,6 +1638,7 @@ export default class ProfitLossMR extends Component { ...@@ -1625,6 +1638,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[19] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={tableMeta.rowData[19]} // value={tableMeta.rowData[19]}
...@@ -1681,6 +1695,7 @@ export default class ProfitLossMR extends Component { ...@@ -1681,6 +1695,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[20] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} // value={value}
...@@ -1736,6 +1751,7 @@ export default class ProfitLossMR extends Component { ...@@ -1736,6 +1751,7 @@ export default class ProfitLossMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null : {tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[0] === 1 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
this.state.get_for == 'view' ? tableMeta.rowData[21] :
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} // value={value}
......
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