Commit bf35abb2 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

apdet

See merge request !1002
parents 902f34f9 65859489
......@@ -3857,7 +3857,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[9], tableMeta, 2)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[9], tableMeta, 2)}
/>
}
/>
......@@ -3877,7 +3878,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[9]).toFixed(1)}
/>
}
/>
......@@ -3897,8 +3899,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={0.0}
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[10], tableMeta, 3)}
// value={handleFormulaRatio(tableMeta.rowData[10], tableMeta, 3)}
/>
}
/>
......@@ -3918,7 +3921,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[10]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[10]).toFixed(1)}
/>
}
/>
......@@ -3939,7 +3943,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[11], tableMeta, 4)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[11], tableMeta, 4)}
/>
}
/>
......@@ -3959,7 +3964,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[11]).toFixed(1)}
/>
}
/>
......@@ -3982,7 +3988,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[12], tableMeta, 5)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[12], tableMeta, 5)}
/>
}
/>
......@@ -4002,7 +4009,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[12]).toFixed(1)}
/>
}
/>
......@@ -4023,7 +4031,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[13], tableMeta, 6)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[13], tableMeta, 6)}
/>
}
/>
......@@ -4043,7 +4052,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[13]).toFixed(1)}
/>
}
/>
......@@ -4064,7 +4074,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[14], tableMeta, 7)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[14], tableMeta, 7)}
/>
}
/>
......@@ -4084,7 +4095,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[14]).toFixed(1)}
/>
}
/>
......@@ -4105,7 +4117,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[15], tableMeta, 8)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[15], tableMeta, 8)}
/>
}
/>
......@@ -4125,7 +4138,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[15]).toFixed(1)}
/>
}
/>
......@@ -4148,7 +4162,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[16], tableMeta, 9)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[16], tableMeta, 9)}
/>
}
/>
......@@ -4168,7 +4183,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[16]).toFixed(1)}
/>
}
/>
......@@ -4189,7 +4205,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[17], tableMeta, 10)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[17], tableMeta, 10)}
/>
}
/>
......@@ -4209,7 +4226,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[17]).toFixed(1)}
/>
}
/>
......@@ -4230,7 +4248,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[18], tableMeta, 11)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[18], tableMeta, 11)}
/>
}
/>
......@@ -4250,7 +4269,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
}
/>
......@@ -4271,7 +4291,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={handleFormulaRatio(tableMeta.rowData[19], tableMeta, 12)}
value={0.0}
// value={handleFormulaRatio(tableMeta.rowData[19], tableMeta, 12)}
/>
}
/>
......@@ -4291,7 +4312,8 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[19]).toFixed(1)}
value={0.0}
// value={Number(tableMeta.rowData[19]).toFixed(1)}
/>
}
/>
......
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