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
59120c2e
Commit
59120c2e
authored
Nov 26, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
rename See merge request
!702
parents
e788f6db
e154ddf1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
10 deletions
+11
-10
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+1
-1
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+1
-1
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+1
-1
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+1
-1
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+1
-1
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+6
-5
No files found.
src/container/BudgetTahunan/BalanceSheet.js
View file @
59120c2e
...
...
@@ -3701,7 +3701,7 @@ export default class BalanceSheet extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER BUDGET - BALANCE SHEET"
?
String
(
this
.
state
.
judul
).
includes
(
"MASTER BUDGET - BALANCE SHEET"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
59120c2e
...
...
@@ -3526,7 +3526,7 @@ export default class CorporateAnnualTarget extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER BUDGET - CAT"
?
String
(
this
.
state
.
judul
).
includes
(
"MASTER BUDGET - CAT"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
59120c2e
...
...
@@ -2850,7 +2850,7 @@ export default class FixedAssetsMovement extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER BUDGET - FIXED ASSETS MOVEMENT"
?
String
(
this
.
state
.
judul
).
includes
(
"MASTER BUDGET - FIXED ASSETS MOVEMENT"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
src/container/BudgetTahunan/ProfitLoss.js
View file @
59120c2e
...
...
@@ -3038,7 +3038,7 @@ export default class ProfitLoss extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER BUDGET - PROFIT LOSS"
?
String
(
this
.
state
.
judul
).
includes
(
"MASTER BUDGET - PROFIT LOSS"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
59120c2e
...
...
@@ -9156,7 +9156,7 @@ export default class TaxPlanning extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER BUDGET - TAX PLANNING"
?
String
(
this
.
state
.
judul
).
includes
(
"MASTER BUDGET - TAX PLANNING"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
src/container/MonthlyReport/TaxPlanningMR.js
View file @
59120c2e
...
...
@@ -94,8 +94,8 @@ export default class TaxPlanningMR extends Component {
"months"
:
this
.
props
.
month
.
month_id
}
api
.
create
().
getHierarkiMontlyReportTP
(
payload
).
then
(
response
=>
{
//
console.log(response);
//
console.log(payload);
console
.
log
(
response
);
console
.
log
(
payload
);
let
dataTable
=
[]
if
(
response
.
data
)
{
if
(
response
.
data
.
status
==
'success'
)
{
...
...
@@ -495,7 +495,8 @@ export default class TaxPlanningMR extends Component {
async
downloadAllData
()
{
let
urls
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=
${
this
.
props
.
monthlyReportId
}
&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
&&months=
${
this
.
props
.
month
.
month_id
}
`
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
&&months=
${
this
.
props
.
month
.
month_id
}
`
// console.log(url);
console
.
log
(
urls
);
console
.
log
(
url
);
let
res
=
await
fetch
(
this
.
props
.
monthlyReportId
==
null
?
url
:
urls
)
...
...
@@ -1525,7 +1526,7 @@ export default class TaxPlanningMR extends Component {
<
/div
>
{
/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */
}
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
,
marginTop
:
20
}}
>
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
button
className
=
"button"
type
=
"button"
...
...
@@ -1750,7 +1751,7 @@ export default class TaxPlanningMR extends Component {
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"TAX PLANNING - MONTHLY REPORT"
?
String
(
this
.
state
.
judul
).
includes
(
"TAX PLANNING - MONTHLY REPORT"
)
?
this
.
checkUpload
()
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
...
...
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