Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
d40354e1
Commit
d40354e1
authored
Nov 24, 2020
by
Faisal Hamdi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
rename See merge request
!692
parents
041e12ae
206e7bac
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+12
-10
No files found.
src/container/MonthlyReport/TaxPlanningMR.js
View file @
d40354e1
...
@@ -94,7 +94,8 @@ export default class TaxPlanningMR extends Component {
...
@@ -94,7 +94,8 @@ export default class TaxPlanningMR extends Component {
"months"
:
this
.
props
.
month
.
month_id
"months"
:
this
.
props
.
month
.
month_id
}
}
api
.
create
().
getHierarkiMontlyReportTP
(
payload
).
then
(
response
=>
{
api
.
create
().
getHierarkiMontlyReportTP
(
payload
).
then
(
response
=>
{
console
.
log
(
response
);
// console.log(response);
// console.log(payload);
let
dataTable
=
[]
let
dataTable
=
[]
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
==
'success'
)
{
if
(
response
.
data
.
status
==
'success'
)
{
...
@@ -205,7 +206,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -205,7 +206,7 @@ export default class TaxPlanningMR extends Component {
// }, () => console.log(this.state.dataTable))
// }, () => console.log(this.state.dataTable))
}
}
backToM
asterBudge
t
(
type
)
{
backToM
onthlyRepor
t
(
type
)
{
let
data
=
[]
let
data
=
[]
this
.
state
.
dataTable
.
map
(
i
=>
{
this
.
state
.
dataTable
.
map
(
i
=>
{
data
.
push
({
data
.
push
({
...
@@ -228,8 +229,8 @@ export default class TaxPlanningMR extends Component {
...
@@ -228,8 +229,8 @@ export default class TaxPlanningMR extends Component {
}
}
api
.
create
(
'UPLOAD'
).
createMonthlyReportTP
(
payload
).
then
(
response
=>
{
api
.
create
(
'UPLOAD'
).
createMonthlyReportTP
(
payload
).
then
(
response
=>
{
console
.
log
(
payload
);
//
console.log(payload);
console
.
log
(
response
);
//
console.log(response);
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
props
.
saveToMonthlyReport
()
this
.
props
.
saveToMonthlyReport
()
...
@@ -293,6 +294,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -293,6 +294,7 @@ export default class TaxPlanningMR extends Component {
checkUpload
()
{
checkUpload
()
{
api
.
create
().
checkUploadMonthlyReportTP
(
this
.
state
.
payload
).
then
(
response
=>
{
api
.
create
().
checkUploadMonthlyReportTP
(
this
.
state
.
payload
).
then
(
response
=>
{
// console.log(JSON.stringify(this.state.payload));
// console.log(JSON.stringify(this.state.payload));
// console.log(this.state.payload)
// console.log(response)
// console.log(response)
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
'success'
)
{
if
(
response
.
data
.
status
===
'success'
)
{
...
@@ -776,7 +778,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -776,7 +778,7 @@ export default class TaxPlanningMR extends Component {
}
}
const
handleChange
=
(
value
,
tableMeta
,
indexChilds
)
=>
{
const
handleChange
=
(
value
,
tableMeta
,
indexChilds
)
=>
{
console
.
log
(
dataTable2
)
//
console.log(dataTable2)
let
val
=
String
(
value
).
split
(
","
).
join
(
""
)
let
val
=
String
(
value
).
split
(
","
).
join
(
""
)
// let data = this.state.dataTable2
// let data = this.state.dataTable2
let
indexParent
=
dataTable2
.
findIndex
((
val
)
=>
val
[
4
]
===
dataTable2
[
tableMeta
.
rowIndex
][
2
])
let
indexParent
=
dataTable2
.
findIndex
((
val
)
=>
val
[
4
]
===
dataTable2
[
tableMeta
.
rowIndex
][
2
])
...
@@ -1444,7 +1446,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1444,7 +1446,7 @@ export default class TaxPlanningMR extends Component {
<
/MuiThemeProvider
>
<
/MuiThemeProvider
>
{
/* )} */
}
{
/* )} */
}
<
/div
>
<
/div
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
,
marginTop
:
20
}}
>
Last
Updated
by
:
{
this
.
state
.
updateBy
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#4b4b4b'
,
marginTop
:
20
,
marginLeft
:
20
}}
>
Last
Updated
by
:
{
this
.
state
.
updateBy
}
<
/Typography
>
<
/div
>
<
/div
>
<
div
className
=
"grid grid-2x"
style
=
{{
marginTop
:
20
}}
>
<
div
className
=
"grid grid-2x"
style
=
{{
marginTop
:
20
}}
>
<
div
className
=
"col-1"
>
<
div
className
=
"col-1"
>
...
@@ -1462,7 +1464,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1462,7 +1464,7 @@ export default class TaxPlanningMR extends Component {
outline
:
'none'
outline
:
'none'
}}
}}
>
>
<
div
style
=
{{
backgroundColor
:
'#019ce5'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
div
style
=
{{
backgroundColor
:
'#019ce5'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
marginLeft
:
20
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Back
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Back
<
/Typography
>
<
/div
>
<
/div
>
<
/button
>
<
/button
>
...
@@ -1505,7 +1507,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1505,7 +1507,7 @@ export default class TaxPlanningMR extends Component {
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
backToM
asterBudge
t
(
'draft'
)
this
.
backToM
onthlyRepor
t
(
'draft'
)
},
100
);
},
100
);
})
})
}
}
...
@@ -1531,7 +1533,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1531,7 +1533,7 @@ export default class TaxPlanningMR extends Component {
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
backToM
asterBudge
t
(
'submitted'
)
this
.
backToM
onthlyRepor
t
(
'submitted'
)
},
100
);
},
100
);
})
})
}
}
...
@@ -1584,7 +1586,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1584,7 +1586,7 @@ export default class TaxPlanningMR extends Component {
style
=
{{
marginRight
:
20
}}
style
=
{{
marginRight
:
20
}}
>
>
<
div
style
=
{{
backgroundColor
:
'#019ce5'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
div
style
=
{{
backgroundColor
:
'#019ce5'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Cancel
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Back
<
/Typography
>
<
/div
>
<
/div
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment