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
f45b37e1
Commit
f45b37e1
authored
Aug 19, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
apdet See merge request
!127
parents
90ca8295
814f6c50
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
234 additions
and
224 deletions
+234
-224
ReportItems.js
src/container/MasterData/ReportItems.js
+4
-4
CreateReportItems.js
...container/MasterData/formReportItems/CreateReportItems.js
+23
-42
EditReportItems.js
src/container/MasterData/formReportItems/EditReportItems.js
+207
-178
No files found.
src/container/MasterData/ReportItems.js
View file @
f45b37e1
...
...
@@ -465,12 +465,11 @@ export default class ReportItems extends Component {
openPopUp
(
index
,
type
)
{
if
(
type
===
'edit'
)
{
this
.
setState
({
selectIndex
:
index
,
rowData
:
index
,
edit
:
true
})
}
else
{
this
.
setState
({
data
:
this
.
state
.
listData
[
index
],
add
:
true
})
}
...
...
@@ -564,6 +563,7 @@ export default class ReportItems extends Component {
const
columns
=
[{
name
:
"Action"
,
options
:
{
sort
:
false
,
customBodyRender
:
(
val
,
tableMeta
)
=>
{
return
(
<
div
style
=
{{
display
:
'flex'
}}
>
...
...
@@ -573,7 +573,7 @@ export default class ReportItems extends Component {
cursor
:
'pointer'
,
borderColor
:
'transparent'
}}
onClick
=
{()
=>
this
.
openPopUp
(
tableMeta
.
row
Index
,
'edit'
)}
onClick
=
{()
=>
this
.
openPopUp
(
tableMeta
.
row
Data
,
'edit'
)}
>
<
img
src
=
{
Images
.
editCopy
}
/
>
...
...
@@ -875,7 +875,7 @@ export default class ReportItems extends Component {
{
this
.
state
.
edit
&&
(
<
EditReportItems
onClickClose
=
{()
=>
this
.
setState
({
edit
:
false
})}
data
=
{
this
.
state
.
listData
[
this
.
state
.
selectIndex
]
}
data
=
{
this
.
state
.
rowData
}
refresh
=
{
this
.
getData
.
bind
(
this
)}
updateReportItems
=
{
this
.
updateReportItems
.
bind
(
this
)}
/
>
...
...
src/container/MasterData/formReportItems/CreateReportItems.js
View file @
f45b37e1
This diff is collapsed.
Click to expand it.
src/container/MasterData/formReportItems/EditReportItems.js
View file @
f45b37e1
This diff is collapsed.
Click to expand it.
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