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
a942abd0
Commit
a942abd0
authored
Oct 09, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
update See merge request
!498
parents
13242284
e139bd01
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
index.js
src/api/index.js
+2
-2
CreateApprovalMatrix.js
src/container/ApprovalMatrix/CreateApprovalMatrix.js
+1
-1
EditApprovalMatrix.js
src/container/ApprovalMatrix/EditApprovalMatrix.js
+1
-1
OperatingIndicatorDetail.js
src/container/OprIndicator/OperatingIndicatorDetail.js
+1
-0
No files found.
src/api/index.js
View file @
a942abd0
...
...
@@ -137,8 +137,8 @@ const create = (type = "") => {
const
searchAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/search_approval_matrix'
,
body
)
const
createAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/create_approval_matrix'
,
body
)
const
updateAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/update_approval_matrix'
,
body
)
const
updateVAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/
visual_approval_matrix
'
,
body
)
const
checkUploadAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/check_import
_approval_matrix
'
,
body
)
const
updateVAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/
save_visualization
'
,
body
)
const
checkUploadAM
=
(
body
)
=>
api
.
post
(
'/approval_matrix/check_import'
,
body
)
const
uploadAM
=
(
body
)
=>
api
.
post
(
'approval_matrix/import_approval_matrix'
,
body
)
const
deleteAM
=
(
id
)
=>
api
.
post
(
`approval_matrix/delete_approval_matrix/
${
id
}
`
)
...
...
src/container/ApprovalMatrix/CreateApprovalMatrix.js
View file @
a942abd0
...
...
@@ -61,7 +61,7 @@ export default class CreateApprovalMatrix extends Component {
let
userData
=
data
.
map
((
item
)
=>
{
return
{
user_id
:
item
.
user_id
,
fullname
:
item
.
fullname
fullname
:
item
.
fullname
==
null
?
"(NO_NAME)"
:
item
.
fullname
}
})
// console.log(userData)
...
...
src/container/ApprovalMatrix/EditApprovalMatrix.js
View file @
a942abd0
...
...
@@ -97,7 +97,7 @@ export default class EditApprovalMatrix extends Component {
let
userData
=
data
.
map
((
item
)
=>
{
return
{
user_id
:
item
.
user_id
,
fullname
:
item
.
fullname
fullname
:
item
.
fullname
==
null
?
"(NO_NAME)"
:
item
.
fullname
}
})
let
index
=
userData
.
findIndex
((
val
)
=>
val
.
user_id
==
this
.
state
.
getUserId
)
...
...
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @
a942abd0
...
...
@@ -426,6 +426,7 @@ export default class BalanceSheet extends Component {
console
.
log
(
JSON
.
stringify
(
body
))
api
.
create
(
'UPLOAD'
).
uploadOperatingInd
(
body
).
then
(
response
=>
{
console
.
log
(
response
);
this
.
setState
({
loading
:
false
})
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
props
.
onClickClose
()
...
...
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