Commit 0ee10887 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-' into 'master'

Deni

See merge request !957
parents acad3c39 827237ce
...@@ -49,7 +49,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -49,7 +49,7 @@ export default class FixedAssetsMovementMR extends Component {
updateBy: '-', updateBy: '-',
notesUpdate: '-', notesUpdate: '-',
get_for: 'view', get_for: 'view',
viewOnly : true viewOnly: true
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
...@@ -61,7 +61,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -61,7 +61,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
handleGetFor(type) { handleGetFor(type) {
this.setState({get_for: type}, () => { this.setState({ get_for: type }, () => {
this.getItemHierarki() this.getItemHierarki()
this.getLatestUpdate() this.getLatestUpdate()
}) })
...@@ -77,23 +77,23 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -77,23 +77,23 @@ export default class FixedAssetsMovementMR extends Component {
} else { } else {
checkApprover = false checkApprover = false
} }
if (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') { if (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') {
checkLastStatus = true checkLastStatus = true
} else { } else {
checkLastStatus = false checkLastStatus = false
} }
// else if (this.props.prevRevision) { // else if (this.props.prevRevision) {
// viewOnly = false // viewOnly = false
// } // }
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') { if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true checkStatus = true
} else { } else {
checkStatus = false checkStatus = false
} }
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus}) this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus })
} }
getLatestUpdate() { getLatestUpdate() {
...@@ -201,10 +201,12 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -201,10 +201,12 @@ export default class FixedAssetsMovementMR extends Component {
} }
}) })
console.log(dataTable); console.log(dataTable);
this.setState({ dataTable }, () => { this.setState({ dataTable, loading: false, refresh: false }, () => {
this.setState({ loading: true, refresh: true })
setTimeout(() => { setTimeout(() => {
this.setState({loading: false, refresh: false}) this.setState({ loading: false, refresh: false })
}, 300); }, 200);
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
...@@ -215,7 +217,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -215,7 +217,7 @@ export default class FixedAssetsMovementMR extends Component {
}, 1000); }, 1000);
} }
}) })
} }
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, refresh: false }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, refresh: false })
} }
...@@ -234,7 +236,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -234,7 +236,7 @@ export default class FixedAssetsMovementMR extends Component {
a.href = url; a.href = url;
a.download = 'Template Monthly Report Fixed Assets Movement.xlsx' a.download = 'Template Monthly Report Fixed Assets Movement.xlsx'
a.click(); a.click();
} }
} }
async downloadAllData() { async downloadAllData() {
...@@ -287,7 +289,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -287,7 +289,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
}); });
} }
checkUpload() { checkUpload() {
api.create().checkUploadMonthlyReportFAM(this.state.payload).then(response => { api.create().checkUploadMonthlyReportFAM(this.state.payload).then(response => {
// console.log(JSON.stringify(this.state.payload)); // console.log(JSON.stringify(this.state.payload));
...@@ -394,7 +396,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -394,7 +396,7 @@ export default class FixedAssetsMovementMR extends Component {
"act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(i[11]), "act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(i[11]),
"act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(i[12]) "act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(i[12])
}) })
}) })
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -405,7 +407,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -405,7 +407,7 @@ export default class FixedAssetsMovementMR extends Component {
"fixed_asset_movement": data "fixed_asset_movement": data
} }
// console.log(JSON.stringify(payload)); // console.log(JSON.stringify(payload));
api.create('UPLOAD').createMonthlyReportFAM(payload).then(response => { api.create('UPLOAD').createMonthlyReportFAM(payload).then(response => {
// console.log(response); // console.log(response);
if (response.data) { if (response.data) {
...@@ -421,8 +423,8 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -421,8 +423,8 @@ export default class FixedAssetsMovementMR extends Component {
this.getSubmission() this.getSubmission()
document.body.style.overflow = 'unset'; document.body.style.overflow = 'unset';
}) })
} }
}) })
} }
closeAlert() { closeAlert() {
...@@ -446,7 +448,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -446,7 +448,7 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(item); // console.log(item);
// console.log(items); // console.log(items);
// console.log(subForm); // console.log(subForm);
let re = /^[a-zA-Z0-9_]+$/; let re = /^[a-zA-Z0-9_]+$/;
if (item !== "") { if (item !== "") {
if (items == ']') { if (items == ']') {
...@@ -477,14 +479,14 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -477,14 +479,14 @@ export default class FixedAssetsMovementMR extends Component {
console.log(tst); console.log(tst);
let indexID = dataTable2[tableMeta.rowIndex][13].findIndex((val) => val.item_formula == tst) let indexID = dataTable2[tableMeta.rowIndex][13].findIndex((val) => val.item_formula == tst)
// console.log(indexID); // console.log(indexID);
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = dataTable2[tableMeta.rowIndex][13][indexID].value let valuezz = dataTable2[tableMeta.rowIndex][13][indexID].value
anjay.push(valuezz == "" ? 0 : valuezz) anjay.push(valuezz == "" ? 0 : valuezz)
// console.log(valuezz); // console.log(valuezz);
} }
} else { } else {
let data = tableMeta.rowData[13] == null? [] : tableMeta.rowData[13] let data = tableMeta.rowData[13] == null ? [] : tableMeta.rowData[13]
let indexID = data.findIndex((val) => val.item_formula == String(`@${item}`)) let indexID = data.findIndex((val) => val.item_formula == String(`@${item}`))
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = data[indexID].value let valuezz = data[indexID].value
...@@ -507,7 +509,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -507,7 +509,7 @@ export default class FixedAssetsMovementMR extends Component {
if (item == '-' || item == '+' || item == '/' || item == '*') { if (item == '-' || item == '+' || item == '/' || item == '*') {
opet = item opet = item
} else { } else {
anjay.push(opet == ''? Number(item) : Number(String(opet + String(item)))) anjay.push(opet == '' ? Number(item) : Number(String(opet + String(item))))
tambahan = false tambahan = false
opet = "" opet = ""
} }
...@@ -655,7 +657,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -655,7 +657,7 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(dataTable2[tableMeta.rowIndex][type]); // console.log(dataTable2[tableMeta.rowIndex][type]);
// console.log(value); // console.log(value);
} }
const handleValue = (data, type) => { const handleValue = (data, type) => {
// console.log(data, type); // console.log(data, type);
let total = 0 let total = 0
...@@ -670,23 +672,23 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -670,23 +672,23 @@ export default class FixedAssetsMovementMR extends Component {
// console.log(indexParent); // console.log(indexParent);
return a return a
} }
const handleVariance = (tableMeta, dex, type) => { const handleVariance = (tableMeta, dex, type) => {
let total = 0 let total = 0
// if (dex === 1) { // if (dex === 1) {
// total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) // total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9])
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[9]); // console.log(tableMeta.rowData[9]);
// console.log(total) // console.log(total)
if (dex === 2) { if (dex === 2) {
total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[6]); // console.log(tableMeta.rowData[6]);
// console.log(total) // console.log(total)
} else if (dex === 3) { } else if (dex === 3) {
total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[7]); // console.log(tableMeta.rowData[7]);
...@@ -694,6 +696,8 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -694,6 +696,8 @@ export default class FixedAssetsMovementMR extends Component {
} }
// console.log(dex) // console.log(dex)
// console.log(Number(tableMeta.columnIndex) + Number(type)) // console.log(Number(tableMeta.columnIndex) + Number(type))
console.log(total);
console.log(dataTable2);
return total return total
} }
...@@ -708,11 +712,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -708,11 +712,11 @@ export default class FixedAssetsMovementMR extends Component {
// if (dex === 1) { // if (dex === 1) {
// total = R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9]) // total = R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
// if (tableMeta.rowData[5] === "Cash and cash equivalent") { // if (tableMeta.rowData[5] === "Cash and cash equivalent") {
// console.log(total); // console.log(total);
// console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])); // console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10]));
// console.log(dataTable2[tableMeta.rowIndex]); // console.log(dataTable2[tableMeta.rowIndex]);
// } // }
if (dex === 2) { if (dex === 2) {
total = R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6]) total = R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...@@ -758,24 +762,31 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -758,24 +762,31 @@ export default class FixedAssetsMovementMR extends Component {
} }
}, },
{ {
name: "Account", name: "Account",
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300, borderRight: '1px #fff solid' }}> <TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 102, backgroundColor: '#1c71b8', width: 300, borderRight: '1px #fff solid' }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
</TableCell> </TableCell>
), ),
setCellProps: () => ({ style }), setCellProps: () => ({ style }),
customBodyRender: (value, tableMeta) => { customBodyRender: (value, tableMeta) => {
return ( return (
<div style={{ width: 300 }}> <div style={{ width: 300 }}>
{tableMeta.rowData[24] ? {tableMeta.rowData[24] ?
tableMeta.rowData[24].length > 0 ? tableMeta.rowData[24].length > 0 ?
<div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}> <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
<LightTooltip title={"Report Items Not Registered"} arrow> <LightTooltip title={"Report Items Not Registered"} arrow>
<span style={{ fontSize: 12, color: 'red' }}>{tableMeta.rowData[0] === 4 ? "" : value}</span> <span style={{ fontSize: 12, color: 'red' }}>{tableMeta.rowData[0] === 4 ? "" : value}</span>
</LightTooltip> </LightTooltip>
</div> </div>
:
tableMeta.rowData[4] === 0 ?
<span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : value).toUpperCase()}</span>
:
<div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
<span style={{ fontSize: 12 }}>{tableMeta.rowData[0] === 4 ? "" : value}</span>
</div>
: :
tableMeta.rowData[4] === 0 ? tableMeta.rowData[4] === 0 ?
<span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : value).toUpperCase()}</span> <span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : value).toUpperCase()}</span>
...@@ -783,50 +794,43 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -783,50 +794,43 @@ export default class FixedAssetsMovementMR extends Component {
<div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}> <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
<span style={{ fontSize: 12 }}>{tableMeta.rowData[0] === 4 ? "" : value}</span> <span style={{ fontSize: 12 }}>{tableMeta.rowData[0] === 4 ? "" : value}</span>
</div> </div>
: }
tableMeta.rowData[4] === 0 ? </div>
<span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : value).toUpperCase()}</span> )
: }
<div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
<span style={{ fontSize: 12 }}>{tableMeta.rowData[0] === 4 ? "" : value}</span>
</div>
}
</div>
)
} }
} }, {
}, { name: `Month To Date (MTD)`,
name: `Month To Date (MTD)`, options: {
options: { customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => ( <th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
<th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> */} </TableCell> */}
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 45}}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 45 }}>{columnMeta.name}</div>
<div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
<span>{"Master Budget (MB)"}</span> <span>{"Master Budget (MB)"}</span>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
<span>{"Rolling Budget (RB)"}</span> <span>{"Rolling Budget (RB)"}</span>
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0', height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
<span>{"Actual"}</span> <span>{"Actual"}</span>
</div>
</div> </div>
</div> </th>
</th> ),
), setCellProps: () => ({ style2 }),
setCellProps: () => ({ style2 }), customBodyRender: (value, tableMeta, updateValue) => {
customBodyRender: (value, tableMeta, updateValue) => { return (
return ( <div>
<div> <div className="grid grid-3x content-center">
<div className="grid grid-3x content-center"> <div className="col-1">
<div className="col-1"> <div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'right', width: 90 }}> {
{ tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? null :
null :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -843,55 +847,14 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -843,55 +847,14 @@ export default class FixedAssetsMovementMR extends Component {
} }
/> />
</div> </div>
} }
</div> </div>
</div>
<div className="col-2">
<div style={{ textAlign: 'right', width: 90 }}>
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)}
/>
}
/>
</div>
}
</div> </div>
</div> <div className="col-2">
<div className="col-3"> <div style={{ textAlign: 'right', width: 90 }}>
<div style={{ textAlign: 'right', width: 120 }}> {
{ tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? null :
null :
this.state.get_for == 'view'?
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)}
/>
}
/>
:
tableMeta.rowData[0] === 3 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -899,312 +862,353 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -899,312 +862,353 @@ export default class FixedAssetsMovementMR extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
// style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
style={{ color: this.props.isApprover || this.state.get_for == 'view'? 'black' : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)}
/>
}
/>
</div>
}
</div>
</div>
<div className="col-3">
<div style={{ textAlign: 'right', width: 120 }}>
{
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null :
this.state.get_for == 'view' ?
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]).toFixed(1)}
onBlur={(event) => {
handleChange(event.target.value, tableMeta, 8)
}}
/> />
} }
/> />
</div> : :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? tableMeta.rowData[0] === 3 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> <div style={{ flex: 1 }}>
<NumberFormat <FormControlLabel
thousandSeparator={true} style={{ margin: 0 }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} value={value}
type="text" control={
placeholder="" <NumberFormat
disabled={true} thousandSeparator={true}
value={Number(handleValueFormula(tableMeta, 8)).toFixed(1)} // style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
/> style={{ color: this.props.isApprover || this.state.get_for == 'view' ? 'black' : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
</span> : type="text"
<div style={{ flex: 1 }}> placeholder=""
<FormControlLabel disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
style={{ margin: 0 }} value={Number(tableMeta.rowData[8]).toFixed(1)}
value={value} onBlur={(event) => {
control={ handleChange(event.target.value, tableMeta, 8)
}}
/>
}
/>
</div> :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<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(tableMeta.rowData[8]).toFixed(1)} value={Number(handleValueFormula(tableMeta, 8)).toFixed(1)}
/> />
} </span> :
/> <div style={{ flex: 1 }}>
</div> <FormControlLabel
} style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)}
/>
}
/>
</div>
}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> )
) }
} }
} }, {
}, { name: `Variance`,
name: `Variance`, options: {
options: { customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => ( <th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} > <div style={{ borderLeft: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}>{columnMeta.name}</div>
<div style={{ borderLeft: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 45, display: 'flex', justifyContent: 'center', alignItems: 'center' }}>{columnMeta.name}</div> <div className="grid grid-2x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="grid grid-2x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', borderBottom: '1px solid #37b5e6' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', borderBottom: '1px solid #37b5e6' }}> <div style={{ borderBottom: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<div style={{ borderBottom: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}> <span>{"Act vs MB"}</span>
<span>{"Act vs MB"}</span>
</div>
<div className="grid grid-2x">
<div className="column-1" style={{ borderRight: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"Amount"}</span>
</div> </div>
<div className="column-2" style={{ padding: 2.5, backgroundColor: '#37b5e6' }}> <div className="grid grid-2x">
<span>{"%"}</span> <div className="column-1" style={{ borderRight: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"Amount"}</span>
</div>
<div className="column-2" style={{ padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"%"}</span>
</div>
</div> </div>
</div> </div>
</div> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', borderBottom: '1px solid #37b5e6' }}>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', border: '1px #fff solid', backgroundColor: '#07a7d0', borderBottom: '1px solid #37b5e6' }}> <div style={{ borderBottom: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<div style={{ borderBottom: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}> <span>{"Act vs RB"}</span>
<span>{"Act vs RB"}</span>
</div>
<div className="grid grid-2x">
<div className="column-1" style={{ borderRight: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"Amount"}</span>
</div> </div>
<div className="column-2" style={{ padding: 2.5, backgroundColor: '#37b5e6' }}> <div className="grid grid-2x">
<span>{"%"}</span> <div className="column-1" style={{ borderRight: '1px #fff solid', padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"Amount"}</span>
</div>
<div className="column-2" style={{ padding: 2.5, backgroundColor: '#37b5e6' }}>
<span>{"%"}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </th>
</th> ),
), setCellProps: () => ({
setCellProps: () => ({ style: {
style: { paddingLeft: 0,
paddingLeft: 0, paddingRight: 10
paddingRight: 10 }
} }),
}), customBodyRender: (val, tableMeta, updateValue) => {
customBodyRender: (val, tableMeta, updateValue) => { // console.log(tableMeta);
// console.log(tableMeta); return (
return ( <div>
<div> <div className="grid grid-2x content-center">
<div className="grid grid-2x content-center"> <div className="column-1">
<div className="column-1"> <div className="grid grid-2x content-center">
<div className="grid grid-2x content-center"> <div className="column-1">
<div className="column-1"> <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' ?
this.state.get_for == 'view'? <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <NumberFormat
<NumberFormat thousandSeparator={true}
thousandSeparator={true} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} type="text"
type="text" placeholder=""
placeholder="" disabled={true}
disabled={true} value={Number(tableMeta.rowData[9]).toFixed(1)}
value={Number(tableMeta.rowData[9]).toFixed(1)} />
/> }
} />
/> :
: <div style={{ flex: 1 }}>
<div style={{ flex: 1 }}> <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <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(handleVariance(tableMeta, 2, 2)).toFixed(1)}
value={Number(handleVariance(tableMeta, 2, 2)).toFixed(1)} />
}
/> />
} </div>
/> }
</div> </div>
}
</div> </div>
</div> <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' ?
this.state.get_for == 'view'? <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <NumberFormat
<NumberFormat thousandSeparator={true}
thousandSeparator={true} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} type="text"
type="text" placeholder=""
placeholder="" disabled={true}
disabled={true} suffix={'%'}
suffix={'%'} value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)}
value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)} />
/> }
} />
/> :
: <div style={{ flex: 1 }}>
<div style={{ flex: 1 }}> <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <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} suffix={'%'}
suffix={'%'} // value={0}
// value={0} value={Number(handleVariancePercent(tableMeta, 2, 3)).toFixed(1)}
value={Number(handleVariancePercent(tableMeta, 2, 3)).toFixed(1)} />
}
/> />
} </div>
/> }
</div> </div>
}
</div> </div>
</div> </div>
</div> </div>
</div> <div className="column-2">
<div className="column-2"> <div className="grid grid-2x content-center">
<div className="grid grid-2x content-center"> <div className="column-1">
<div className="column-1"> <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' ?
this.state.get_for == 'view'? <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <NumberFormat
<NumberFormat thousandSeparator={true}
thousandSeparator={true} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} type="text"
type="text" placeholder=""
placeholder="" disabled={true}
disabled={true} value={Number(tableMeta.rowData[11]).toFixed(1)}
value={Number(tableMeta.rowData[11]).toFixed(1)} />
/> }
} />
/> :
: <div style={{ flex: 1 }}>
<div style={{ flex: 1 }}> <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <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(handleVariance(tableMeta, 3, 4)).toFixed(1)}
value={Number(handleVariance(tableMeta, 3, 4)).toFixed(1)} />
}
/> />
} </div>
/> }
</div> </div>
}
</div> </div>
</div> <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' ?
this.state.get_for == 'view'? <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <NumberFormat
<NumberFormat thousandSeparator={true}
thousandSeparator={true} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} type="text"
type="text" placeholder=""
placeholder="" disabled={true}
disabled={true} suffix={'%'}
suffix={'%'} value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)}
value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)} />
/> }
} />
/> :
: <div style={{ flex: 1 }}>
<div style={{ flex: 1 }}> <FormControlLabel
<FormControlLabel style={{ margin: 0 }}
style={{ margin: 0 }} value={val}
value={val} control={
control={ <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} suffix={'%'}
suffix={'%'} // value={0}
// value={0} value={Number(handleVariancePercent(tableMeta, 3, 5)).toFixed(1)}
value={Number(handleVariancePercent(tableMeta, 3, 5)).toFixed(1)} />
}
/> />
} </div>
/> }
</div> </div>
}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> )
) }
} }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }, {
}, { name: "",
name: "", options: {
options: { display: false
display: false }
} }]
}]
const loadingComponent = ( const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}> <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
...@@ -1242,7 +1246,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1242,7 +1246,7 @@ export default class FixedAssetsMovementMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
{this.props.isApprover === true || this.state.get_for == 'view'? {this.props.isApprover === true || this.state.get_for == 'view' ?
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download'} data-for="download"> <a data-tip={'Download'} data-for="download">
<button <button
...@@ -1273,7 +1277,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1273,7 +1277,7 @@ export default class FixedAssetsMovementMR extends Component {
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => this.downloadTemplate() } onClick={() => this.downloadTemplate()}
> >
<img src={Images.template} /> <img src={Images.template} />
</button> </button>
...@@ -1301,10 +1305,10 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1301,10 +1305,10 @@ export default class FixedAssetsMovementMR extends Component {
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => onClick={() =>
this.setState({ loading: true }, () => { this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.downloadAllData() this.downloadAllData()
}, 100); }, 100);
})} })}
> >
...@@ -1353,7 +1357,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1353,7 +1357,7 @@ export default class FixedAssetsMovementMR extends Component {
</button> </button>
</div> </div>
{this.props.isApprover === true ? {this.props.isApprover === true ?
<div className="col-2"></div> <div className="col-2"></div>
: :
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}> <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
{this.state.get_for == 'view' && this.state.viewOnly && <button {this.state.get_for == 'view' && this.state.viewOnly && <button
...@@ -1366,8 +1370,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1366,8 +1370,11 @@ export default class FixedAssetsMovementMR extends Component {
outline: 'none' outline: 'none'
}} }}
onClick={() => { onClick={() => {
this.setState({loading: true, refresh: true}, () => { this.setState({ loading: true, refresh: true }, () => {
this.handleGetFor('edit') this.handleGetFor('edit')
// setTimeout(() => {
// this.setState({ loading: false })
// }, 100);
}) })
}} }}
> >
...@@ -1444,7 +1451,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1444,7 +1451,7 @@ export default class FixedAssetsMovementMR extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div> </div>
</button>} </button>}
</div> </div>
} }
</div> </div>
</Paper> : </Paper> :
...@@ -1562,7 +1569,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1562,7 +1569,7 @@ export default class FixedAssetsMovementMR extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
</div> </div>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</Paper> </Paper>
......
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