Skip to content

T
Tia-dev
You need to sign in or sign up before continuing.
Commit 416d1414 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

pl summary

See merge request !1075
parents a4c770a0 4fb3e440
Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 77 deletions
src/container/Laporan/SubHolding.js
View file @ 416d1414
......@@ -1543,63 +1543,139 @@ export default class SubHolding extends Component {
const handlePushChild = (item) => {
let indexIDzz = dbSumaPL.findIndex((val) => val[1] === item.id)
if (indexIDzz === -1) {
let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : item.profit_loss.mtd_actual
let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : item.profit_loss.mtd_mb
let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : Number(item.profit_loss.mtd_actual)
let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : Number(item.profit_loss.mtd_mb)
let mtd_last_year = item.profit_loss.mtd_last_year == ''? 0 : Number(item.profit_loss.mtd_last_year)
let persenMtd = 0
if (mtd_mb < 0) {
if (mtd_actual >= mtd_mb) {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb + 1 )
persenMtd = (mtd_mb - mtd_actual) / mtd_mb + 1
} else {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb)
persenMtd = (mtd_mb - mtd_actual) / mtd_mb
}
}
else {
persenMtd = Number(mtd_actual/mtd_mb)
persenMtd = mtd_actual / mtd_mb
}
let persenMtdLY = 0
if (mtd_last_year < 0) {
if (mtd_actual >= mtd_last_year) {
persenMtdLY = (mtd_last_year - mtd_actual) / mtd_last_year + 1
} else {
persenMtdLY = (mtd_last_year - mtd_actual) / mtd_last_year
}
}
else {
persenMtdLY = mtd_actual/mtd_last_year
}
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : Number(item.profit_loss.ytd_actual)
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : Number(item.profit_loss.ytd_mb)
let ytd_last_year = item.profit_loss.ytd_last_year == ''? 0 : Number(item.profit_loss.ytd_last_year)
let persenYtdMB = 0
if (ytd_mb < 0) {
if (ytd_actual >= ytd_mb) {
persenYtdMB = ((ytd_mb - ytd_actual) / ytd_mb + 1 )
persenYtdMB = (ytd_mb - ytd_actual) / ytd_mb + 1
} else {
persenYtdMB = ((ytd_mb - ytd_actual) / ytd_mb)
persenYtdMB = (ytd_mb - ytd_actual) / ytd_mb
}
}
else {
persenYtdMB = Number(ytd_actual/ytd_mb)
persenYtdMB = ytd_actual / ytd_mb
}
let persenYtdLY = 0
if (ytd_last_year < 0) {
if (ytd_actual >= ytd_last_year) {
persenYtdLY = ((ytd_last_year - ytd_actual) / ytd_last_year + 1 )
persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year + 1
} else {
persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year
}
}
else {
persenYtdLY = Number(ytd_actual/ytd_last_year)
}
let q1_actual = item.profit_loss.q1_actual == ''? 0 : item.profit_loss.q1_actual
let q1_mb = item.profit_loss.q1_mb == ''? 0 : item.profit_loss.q1_mb
let q1_last_year = item.profit_loss.q1_last_year == ''? 0 : item.profit_loss.q1_last_year
let persenQuarterMB = Number(q1_actual/q1_mb)
let persenQuarterLY = Number(q1_actual/q1_last_year)
let fy_actual = item.profit_loss.fy_actual == ''? 0 : item.profit_loss.fy_actual
let fy_mb = item.profit_loss.fy_mb == ''? 0 : item.profit_loss.fy_mb
let fy_ol = item.profit_loss.fy_ol == ''? 0 : item.profit_loss.fy_ol
let fy_last_year = item.profit_loss.fy_last_year == ''? 0 : item.profit_loss.fy_last_year
let persenFyMB = Number(fy_actual/fy_mb)
let persenFyOL = Number(fy_actual/fy_ol)
let persenFyLY = Number(fy_actual/fy_last_year)
persenYtdLY = ytd_actual / ytd_last_year
}
let q1_actual = item.profit_loss.q1_actual == ''? 0 : Number(item.profit_loss.q1_actual)
let q1_mb = item.profit_loss.q1_mb == ''? 0 : Number(item.profit_loss.q1_mb)
let q1_last_year = item.profit_loss.q1_last_year == ''? 0 : Number(item.profit_loss.q1_last_year)
let persenQuarterMB = 0
if (q1_mb < 0) {
if (q1_actual >= q1_mb) {
persenQuarterMB = (q1_mb - q1_actual) / q1_mb + 1
} else {
persenQuarterMB = (q1_mb - q1_actual) / q1_mb
}
}
else {
persenQuarterMB = q1_actual / q1_mb
}
let persenQuarterLY = 0
if (q1_last_year < 0) {
if (q1_actual >= q1_last_year) {
persenQuarterLY = (q1_last_year - q1_actual) / q1_last_year + 1
} else {
persenQuarterLY = (q1_last_year - q1_actual) / q1_last_year
}
}
else {
persenQuarterLY = q1_actual / q1_last_year
}
let fy_actual = item.profit_loss.fy_actual == ''? 0 : Number(item.profit_loss.fy_actual)
let fy_mb = item.profit_loss.fy_mb == ''? 0 : Number(item.profit_loss.fy_mb)
let fy_ol = item.profit_loss.fy_ol == ''? 0 : Number(item.profit_loss.fy_ol)
let fy_last_year = item.profit_loss.fy_last_year == ''? 0 : Number(item.profit_loss.fy_last_year)
let persenFyMB = 0
if (fy_mb < 0) {
if (fy_actual >= fy_mb) {
persenFyMB = (fy_mb - fy_actual) / fy_mb + 1
} else {
persenFyMB = (fy_mb - fy_actual) / fy_mb
}
}
else {
persenFyMB = fy_actual / fy_mb
}
let persenFyOL = 0
if (fy_ol < 0) {
if (fy_actual >= fy_ol) {
persenFyOL = (fy_ol - fy_actual) / fy_ol + 1
} else {
persenFyOL = (fy_ol - fy_actual) / fy_ol
}
}
else {
persenFyOL = fy_actual / fy_ol
}
let persenFyLY = 0
if (fy_last_year < 0) {
if (fy_actual >= fy_last_year) {
persenFyLY = (fy_last_year - fy_actual) / fy_last_year + 1
} else {
persenFyLY = (fy_last_year - fy_actual) / fy_last_year
}
}
else {
persenFyLY = fy_actual / fy_last_year
}
let persenFyOLMB = Number(fy_ol/fy_mb)
if (fy_mb < 0) {
if (fy_ol >= fy_mb) {
persenFyLY = (fy_mb - fy_ol) / fy_mb + 1
} else {
persenFyLY = (fy_mb - fy_ol) / fy_mb
}
}
else {
persenFyLY = fy_ol / fy_mb
}
dbSumaPL.push([
item.type_report_id,
......@@ -1612,6 +1688,7 @@ export default class SubHolding extends Component {
item.profit_loss.mtd_mb,
isNaN(persenMtd) || persenMtd == 'Infinity' || persenMtd == '-Infinity'? (item.profit_loss.mtd_mb == '' || item.profit_loss.mtd_mb == 0? -0 : 0) : (item.profit_loss.mtd_mb == '' || item.profit_loss.mtd_mb == 0? persenMtd * -100 : persenMtd * 100),
item.profit_loss.mtd_last_year,
isNaN(persenMtdLY) || persenMtdLY == 'Infinity' || persenMtdLY == '-Infinity'? (item.profit_loss.mtd_last_year == '' || item.profit_loss.mtd_last_year == 0? -0 : 0) : (item.profit_loss.mtd_last_year == '' || item.profit_loss.mtd_last_year == 0? persenMtdLY * -100 : persenMtdLY * 100),
item.profit_loss.ytd_actual,
item.profit_loss.ytd_mb,
isNaN(persenYtdMB) || persenYtdMB == 'Infinity' || persenYtdMB == '-Infinity'? (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? -0 : 0) : (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? persenYtdMB * -100 : persenYtdMB * 100),
......@@ -1646,39 +1723,137 @@ export default class SubHolding extends Component {
res.map((item,index) => {
let mtd_actual = item.profit_loss.mtd_actual == ''? 0 : Number(item.profit_loss.mtd_actual)
let mtd_mb = item.profit_loss.mtd_mb == ''? 0 : Number(item.profit_loss.mtd_mb)
let mtd_last_year = item.profit_loss.mtd_last_year == ''? 0 : Number(item.profit_loss.mtd_last_year)
let persenMtd = 0
if (mtd_mb < 0) {
if (mtd_actual >= mtd_mb) {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb + 1 )
persenMtd = (mtd_mb - mtd_actual) / mtd_mb + 1
} else {
persenMtd = ((mtd_mb - mtd_actual) / mtd_mb)
persenMtd = (mtd_mb - mtd_actual) / mtd_mb
}
}
else {
persenMtd = Number(mtd_actual/mtd_mb)
persenMtd = mtd_actual / mtd_mb
}
let persenMtdLY = 0
if (mtd_last_year < 0) {
if (mtd_actual >= mtd_last_year) {
persenMtdLY = (mtd_last_year - mtd_actual) / mtd_last_year + 1
} else {
persenMtdLY = (mtd_last_year - mtd_actual) / mtd_last_year
}
}
else {
persenMtdLY = mtd_actual/mtd_last_year
}
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : item.profit_loss.ytd_actual
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : item.profit_loss.ytd_mb
let ytd_last_year = item.profit_loss.ytd_last_year == ''? 0 : item.profit_loss.ytd_last_year
let persenYtdMB = Number(ytd_actual/ytd_mb)
let persenYtdLY = Number(ytd_actual/ytd_last_year)
let q1_actual = item.profit_loss.q1_actual == ''? 0 : item.profit_loss.q1_actual
let q1_mb = item.profit_loss.q1_mb == ''? 0 : item.profit_loss.q1_mb
let q1_last_year = item.profit_loss.q1_last_year == ''? 0 : item.profit_loss.q1_last_year
let persenQuarterMB = Number(q1_actual/q1_mb)
let persenQuarterLY = Number(q1_actual/q1_last_year)
let ytd_actual = item.profit_loss.ytd_actual == ''? 0 : Number(item.profit_loss.ytd_actual)
let ytd_mb = item.profit_loss.ytd_mb == ''? 0 : Number(item.profit_loss.ytd_mb)
let ytd_last_year = item.profit_loss.ytd_last_year == ''? 0 : Number(item.profit_loss.ytd_last_year)
let persenYtdMB = 0
if (ytd_mb < 0) {
if (ytd_actual >= ytd_mb) {
persenYtdMB = (ytd_mb - ytd_actual) / ytd_mb + 1
} else {
persenYtdMB = (ytd_mb - ytd_actual) / ytd_mb
}
}
else {
persenYtdMB = ytd_actual / ytd_mb
}
let persenYtdLY = 0
if (ytd_last_year < 0) {
if (ytd_actual >= ytd_last_year) {
persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year + 1
} else {
persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year
}
}
else {
persenYtdLY = ytd_actual / ytd_last_year
}
let q1_actual = item.profit_loss.q1_actual == ''? 0 : Number(item.profit_loss.q1_actual)
let q1_mb = item.profit_loss.q1_mb == ''? 0 : Number(item.profit_loss.q1_mb)
let q1_last_year = item.profit_loss.q1_last_year == ''? 0 : Number(item.profit_loss.q1_last_year)
let persenQuarterMB = 0
if (q1_mb < 0) {
if (q1_actual >= q1_mb) {
persenQuarterMB = (q1_mb - q1_actual) / q1_mb + 1
} else {
persenQuarterMB = (q1_mb - q1_actual) / q1_mb
}
}
else {
persenQuarterMB = q1_actual / q1_mb
}
let persenQuarterLY = 0
if (q1_last_year < 0) {
if (q1_actual >= q1_last_year) {
persenQuarterLY = (q1_last_year - q1_actual) / q1_last_year + 1
} else {
persenQuarterLY = (q1_last_year - q1_actual) / q1_last_year
}
}
else {
persenQuarterLY = q1_actual / q1_last_year
}
let fy_actual = item.profit_loss.fy_actual == ''? 0 : Number(item.profit_loss.fy_actual)
let fy_mb = item.profit_loss.fy_mb == ''? 0 : Number(item.profit_loss.fy_mb)
let fy_ol = item.profit_loss.fy_ol == ''? 0 : Number(item.profit_loss.fy_ol)
let fy_last_year = item.profit_loss.fy_last_year == ''? 0 : Number(item.profit_loss.fy_last_year)
let persenFyMB = 0
if (fy_mb < 0) {
if (fy_actual >= fy_mb) {
persenFyMB = (fy_mb - fy_actual) / fy_mb + 1
} else {
persenFyMB = (fy_mb - fy_actual) / fy_mb
}
}
else {
persenFyMB = fy_actual / fy_mb
}
let persenFyOL = 0
if (fy_ol < 0) {
if (fy_actual >= fy_ol) {
persenFyOL = (fy_ol - fy_actual) / fy_ol + 1
} else {
persenFyOL = (fy_ol - fy_actual) / fy_ol
}
}
else {
persenFyOL = fy_actual / fy_ol
}
let persenFyLY = 0
if (fy_last_year < 0) {
if (fy_actual >= fy_last_year) {
persenFyLY = (fy_last_year - fy_actual) / fy_last_year + 1
} else {
persenFyLY = (fy_last_year - fy_actual) / fy_last_year
}
}
else {
persenFyLY = fy_actual / fy_last_year
}
let fy_actual = item.profit_loss.fy_actual == ''? 0 : item.profit_loss.fy_actual
let fy_mb = item.profit_loss.fy_mb == ''? 0 : item.profit_loss.fy_mb
let fy_ol = item.profit_loss.fy_ol == ''? 0 : item.profit_loss.fy_ol
let fy_last_year = item.profit_loss.fy_last_year == ''? 0 : item.profit_loss.fy_last_year
let persenFyMB = Number(fy_actual/fy_mb)
let persenFyOL = Number(fy_actual/fy_ol)
let persenFyLY = Number(fy_actual/fy_last_year)
let persenFyOLMB = Number(fy_ol/fy_mb)
if (fy_mb < 0) {
if (fy_ol >= fy_mb) {
persenFyLY = (fy_mb - fy_ol) / fy_mb + 1
} else {
persenFyLY = (fy_mb - fy_ol) / fy_mb
}
}
else {
persenFyLY = fy_ol / fy_mb
}
dbSumaPL.push([
item.type_report_id,
......@@ -1691,6 +1866,7 @@ export default class SubHolding extends Component {
item.profit_loss.mtd_mb,
isNaN(persenMtd) || persenMtd == 'Infinity' || persenMtd == '-Infinity'? (item.profit_loss.mtd_mb == '' || item.profit_loss.mtd_mb == 0? -0 : 0) : (item.profit_loss.mtd_mb == '' || item.profit_loss.mtd_mb == 0? persenMtd * -100 : persenMtd * 100),
item.profit_loss.mtd_last_year,
isNaN(persenMtdLY) || persenMtdLY == 'Infinity' || persenMtdLY == '-Infinity'? (item.profit_loss.mtd_last_year == '' || item.profit_loss.mtd_last_year == 0? -0 : 0) : (item.profit_loss.mtd_last_year == '' || item.profit_loss.mtd_last_year == 0? persenMtdLY * -100 : persenMtdLY * 100),
item.profit_loss.ytd_actual,
item.profit_loss.ytd_mb,
isNaN(persenYtdMB) || persenYtdMB == 'Infinity' || persenYtdMB == '-Infinity'? (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? -0 : 0) : (item.profit_loss.ytd_mb == '' || item.profit_loss.ytd_mb == 0? persenYtdMB * -100 : persenYtdMB * 100),
......
src/container/Laporan/TableSubHolding.js
View file @ 416d1414
......@@ -15456,7 +15456,7 @@ export default class TableSubHolding extends Component {
{tableMeta.rowData[0] === 4 ? null : tableMeta.rowData[4] === 0 ? null : tableMeta.rowData[4] === 1 ? null :
<FormControlLabel
style={{ margin: 0 }}
// value={tableMeta.rowData[30]}
// value={tableMeta.rowData[31]}
control={
<Input
disableUnderline={true}
......@@ -15464,8 +15464,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
// value={tableMeta.rowData[30]}
defaultValue={tableMeta.rowData[30]}
// value={tableMeta.rowData[31]}
defaultValue={tableMeta.rowData[31]}
inputProps={{
style: {
color: "#5198ea"
......@@ -15490,7 +15490,7 @@ export default class TableSubHolding extends Component {
<th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', color: '#fff', top: 0, zIndex: 102, 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, height: 50, paddingTop: 15 }}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"Actual"}</span>
</div>
......@@ -15503,6 +15503,9 @@ export default class TableSubHolding extends Component {
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d06' }}>
<span>{"Last Year"}</span>
</div>
<div className="column-5" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d06' }}>
<span>{"% of LY"}</span>
</div>
</div>
</div>
</th>
......@@ -15512,7 +15515,7 @@ export default class TableSubHolding extends Component {
return (
<div>
<div className="grid grid-1x content-center">
<div className="grid grid-4x content-center">
<div className="grid grid-5x content-center">
<div className="col-1">
{tableMeta.rowData[0] === 4 ?
null
......@@ -15608,6 +15611,30 @@ export default class TableSubHolding extends Component {
</div>
}
</div>
<div className="col-5">
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[0] === 1 ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={val}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[10]).toFixed(2)}
/>
}
/>
</div>
}
</div>
</div>
</div>
</div>
......@@ -15663,7 +15690,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[10]).toFixed(1)}
value={Number(tableMeta.rowData[11]).toFixed(1)}
/>
}
/>
......@@ -15686,7 +15713,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(1)}
value={Number(tableMeta.rowData[12]).toFixed(1)}
/>
}
/>
......@@ -15710,7 +15737,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(2)}
value={Number(tableMeta.rowData[13]).toFixed(2)}
/>
}
/>
......@@ -15733,7 +15760,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(1)}
value={Number(tableMeta.rowData[14]).toFixed(1)}
/>
}
/>
......@@ -15757,7 +15784,7 @@ export default class TableSubHolding extends Component {
suffix={'%'}
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(2)}
value={Number(tableMeta.rowData[15]).toFixed(2)}
/>
}
/>
......@@ -15819,7 +15846,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(1)}
value={Number(tableMeta.rowData[16]).toFixed(1)}
/>
}
/>
......@@ -15842,7 +15869,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(1)}
value={Number(tableMeta.rowData[17]).toFixed(1)}
/>
}
/>
......@@ -15866,7 +15893,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(2)}
value={Number(tableMeta.rowData[18]).toFixed(2)}
/>
}
/>
......@@ -15889,7 +15916,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)}
value={Number(tableMeta.rowData[19]).toFixed(1)}
/>
}
/>
......@@ -15913,7 +15940,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[19]).toFixed(2)}
value={Number(tableMeta.rowData[20]).toFixed(2)}
/>
}
/>
......@@ -15987,7 +16014,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[20]).toFixed(1)}
value={Number(tableMeta.rowData[21]).toFixed(1)}
/>
}
/>
......@@ -16010,7 +16037,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[21]).toFixed(1)}
value={Number(tableMeta.rowData[22]).toFixed(1)}
/>
}
/>
......@@ -16034,7 +16061,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[22]).toFixed(2)}
value={Number(tableMeta.rowData[23]).toFixed(2)}
/>
}
/>
......@@ -16057,7 +16084,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[23]).toFixed(1)}
value={Number(tableMeta.rowData[24]).toFixed(1)}
/>
}
/>
......@@ -16084,7 +16111,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[24]).toFixed(1)}
value={Number(tableMeta.rowData[25]).toFixed(1)}
/>
}
/>
......@@ -16107,7 +16134,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[25]).toFixed(1)}
value={Number(tableMeta.rowData[26]).toFixed(1)}
/>
}
/>
......@@ -16131,7 +16158,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[26]).toFixed(2)}
value={Number(tableMeta.rowData[27]).toFixed(2)}
/>
}
/>
......@@ -16155,7 +16182,7 @@ export default class TableSubHolding extends Component {
placeholder=""
suffix={'%'}
disabled={true}
value={Number(tableMeta.rowData[27]).toFixed(2)}
value={Number(tableMeta.rowData[28]).toFixed(2)}
/>
}
/>
......@@ -16204,7 +16231,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[28]).toFixed(1)}
value={Number(tableMeta.rowData[29]).toFixed(1)}
/>
}
/>
......@@ -16249,7 +16276,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[29]).toFixed(1)}
value={Number(tableMeta.rowData[30]).toFixed(1)}
/>
}
/>
......@@ -16349,6 +16376,11 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
} , {
name: "",
options: {
display: false
}
}
]
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