Skip to content

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

Merge branch 'didam' into 'master' 

apdet yasalam

See merge request !875
parents eb184e67 60677c8b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 64 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 458d3a57
...@@ -251,7 +251,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -251,7 +251,7 @@ export default class CorporateAnnualTarget extends Component {
} }
} }
}) })
// // console.log(dataTable) console.log(dataTable)
this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn, dataFin, dataLearn}, () => { this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn, dataFin, dataLearn}, () => {
// // // console.log(dataCustomerPrs) // // // console.log(dataCustomerPrs)
}) })
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 458d3a57
...@@ -848,6 +848,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -848,6 +848,9 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
this.state.get_for == 'view'?
Number(tableMeta.rowData[8]).toFixed(1)
:
tableMeta.rowData[0] === 3 ? tableMeta.rowData[0] === 3 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
...@@ -919,6 +922,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -919,6 +922,9 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
this.state.get_for == 'view'?
Number(tableMeta.rowData[9]).toFixed(1)
:
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
...@@ -1017,6 +1023,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1017,6 +1023,9 @@ export default class FixedAssetsMovementMR extends Component {
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 ? {tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 ?
null : null :
this.state.get_for == 'view'?
Number(tableMeta.rowData[10]).toFixed(1)
:
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1039,7 +1048,10 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1039,7 +1048,10 @@ export default class FixedAssetsMovementMR extends Component {
<div className="column-2"> <div className="column-2">
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{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 }}
...@@ -1068,6 +1080,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1068,6 +1080,9 @@ export default class FixedAssetsMovementMR extends Component {
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{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 }}
...@@ -1090,7 +1105,10 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1090,7 +1105,10 @@ export default class FixedAssetsMovementMR extends Component {
<div className="column-2"> <div className="column-2">
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{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 }}
...@@ -1119,6 +1137,9 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1119,6 +1137,9 @@ export default class FixedAssetsMovementMR extends Component {
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{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 }}
...@@ -1141,7 +1162,10 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1141,7 +1162,10 @@ export default class FixedAssetsMovementMR extends Component {
<div className="column-2"> <div className="column-2">
<div style={{ textAlign: 'right', width: 120 }}> <div style={{ textAlign: 'right', width: 120 }}>
{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 }}
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 458d3a57
...@@ -881,6 +881,9 @@ export default class TaxPlanningMR extends Component { ...@@ -881,6 +881,9 @@ export default class TaxPlanningMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[1] === 4 || tableMeta.rowData[1] === 1 ? {tableMeta.rowData[1] === 4 || tableMeta.rowData[1] === 1 ?
null : null :
this.state.get_for == 'view'?
Number(value.tbc).toFixed(1)
:
tableMeta.rowData[1] === 2 ? tableMeta.rowData[1] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -943,6 +946,9 @@ export default class TaxPlanningMR extends Component { ...@@ -943,6 +946,9 @@ export default class TaxPlanningMR extends Component {
{tableMeta.rowData[2] === 4 || tableMeta.rowData[2] === 1 ? {tableMeta.rowData[2] === 4 || tableMeta.rowData[2] === 1 ?
null null
: :
this.state.get_for == 'view'?
Number(value.fcp).toFixed(1)
:
tableMeta.rowData[2] === 2 ? tableMeta.rowData[2] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1003,6 +1009,9 @@ export default class TaxPlanningMR extends Component { ...@@ -1003,6 +1009,9 @@ export default class TaxPlanningMR extends Component {
<div style={{ textAlign: 'right', width: 90 }}> <div style={{ textAlign: 'right', width: 90 }}>
{tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ? {tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ?
null : null :
this.state.get_for == 'view'?
Number(value.tbf).toFixed(1)
:
tableMeta.rowData[3] === 2 ? tableMeta.rowData[3] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1130,6 +1139,9 @@ export default class TaxPlanningMR extends Component { ...@@ -1130,6 +1139,9 @@ export default class TaxPlanningMR extends Component {
{tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ? {tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ?
null null
: :
this.state.get_for == 'view'?
Number(value).toFixed(1)
:
tableMeta.rowData[3] === 2 ? tableMeta.rowData[3] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
...@@ -1224,6 +1236,9 @@ export default class TaxPlanningMR extends Component { ...@@ -1224,6 +1236,9 @@ export default class TaxPlanningMR extends Component {
{tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ? {tableMeta.rowData[3] === 4 || tableMeta.rowData[3] === 1 ?
null null
: :
this.state.get_for == 'view'?
Number(value).toFixed(1)
:
tableMeta.rowData[3] === 2 ? tableMeta.rowData[3] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat <NumberFormat
......
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