Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CmsPetrolPay
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
11
Issues
11
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
Giang Tran
CmsPetrolPay
Commits
0bf0a395
Commit
0bf0a395
authored
4 months ago
by
tdgiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update code
parent
ba6234e7
dev_3
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
250 additions
and
18 deletions
+250
-18
AcceptStore.jsx
src/app/components/dialog/AcceptStore.jsx
+120
-0
RejectStore.jsx
src/app/components/dialog/RejectStore.jsx
+75
-0
Index.js
src/app/views/GasStation/Index.js
+6
-1
Table.js
src/app/views/GasStation/Table.js
+23
-15
detail.js
src/app/views/GasStation/detail.js
+26
-2
No files found.
src/app/components/dialog/AcceptStore.jsx
0 → 100644
View file @
0bf0a395
import
React
,
{
useState
,
useEffect
,
use
}
from
'react'
import
{
Button
,
FormControl
,
Grid
,
InputLabel
,
Select
,
TextField
,
Typography
,
DialogActions
,
Dialog
,
DialogContent
,
DialogContentText
,
DialogTitle
,
IconButton
,
Icon
,
Tooltip
,
FormControlLabel
,
Checkbox
,
}
from
'@material-ui/core'
import
{
toast
}
from
'react-toastify'
import
{
useTranslation
}
from
'react-i18next'
import
{
hideLoading
,
showLoading
}
from
'app/redux/actions/loadingAction'
import
{
connect
}
from
'react-redux'
import
{
KeyboardDatePicker
}
from
'@material-ui/pickers'
function
FormDialog
(
props
)
{
const
{
t
}
=
useTranslation
()
const
{
open
,
handleClose
,
data
,
onAgree
}
=
props
const
[
forever
,
setForever
]
=
useState
(
true
)
const
[
name
,
setName
]
=
useState
()
const
[
date
,
setDate
]
=
useState
(
addOneYear
())
const
handleDateChangeLast
=
(
date
)
=>
{
setDate
(
date
)
}
function
addOneYear
()
{
// Create a new Date object from the provided date
let
newDate
=
new
Date
()
// Add one year to the new date
newDate
.
setFullYear
(
newDate
.
getFullYear
()
+
1
)
return
newDate
}
return
(
<
Dialog
open=
{
open
}
onClose=
{
handleClose
}
aria
-
labelledby=
"form-dialog-title"
>
<
DialogTitle
id=
"form-dialog-title"
>
Bạn có chắc chắc muốn duyệt tạo cửa hàng này?
</
DialogTitle
>
<
DialogContent
>
<
FormControlLabel
className=
"min-w-88"
control=
{
<
Checkbox
size=
"small"
color=
"primary"
onChange=
{
(
event
)
=>
{
setForever
(
event
.
target
.
checked
)
}
}
value=
{
forever
}
checked=
{
forever
}
/>
}
label=
"Vô thời hạn"
/>
{
!
forever
&&
(
<
KeyboardDatePicker
style=
{
{
marginTop
:
15
,
}
}
placeholder=
"dd/MM/yyyy"
label=
{
'Thời gian hoạt động của cây xăng'
}
disableToolbar
inputVariant=
{
'outlined'
}
fullWidth
minDate=
{
new
Date
()
}
clearable=
{
true
}
format=
"dd/MM/yyyy"
value=
{
date
}
onChange=
{
handleDateChangeLast
}
KeyboardButtonProps=
{
{
'aria-label'
:
'change date'
,
}
}
/>
)
}
</
DialogContent
>
<
DialogActions
>
<
Button
color=
"secondary"
onClick=
{
handleClose
}
>
Thoát
</
Button
>
<
Button
onClick=
{
()
=>
{
onAgree
(
forever
,
date
)
}
}
color=
"primary"
>
Đồng ý
</
Button
>
</
DialogActions
>
</
Dialog
>
)
}
const
mapStateToProps
=
(
state
)
=>
{
return
{}
}
export
default
connect
(
mapStateToProps
,
{
showLoading
,
hideLoading
})(
FormDialog
)
This diff is collapsed.
Click to expand it.
src/app/components/dialog/RejectStore.jsx
0 → 100644
View file @
0bf0a395
import
React
,
{
useState
,
useEffect
,
use
}
from
'react'
import
{
Button
,
FormControl
,
Grid
,
InputLabel
,
Select
,
TextField
,
Typography
,
DialogActions
,
Dialog
,
DialogContent
,
DialogContentText
,
DialogTitle
,
IconButton
,
Icon
,
Tooltip
,
}
from
'@material-ui/core'
import
{
toast
}
from
'react-toastify'
import
{
useTranslation
}
from
'react-i18next'
import
{
hideLoading
,
showLoading
}
from
'app/redux/actions/loadingAction'
import
{
connect
}
from
'react-redux'
function
FormDialog
(
props
)
{
const
{
t
}
=
useTranslation
()
const
{
open
,
handleClose
,
data
,
onAgree
}
=
props
const
[
name
,
setName
]
=
useState
()
return
(
<
Dialog
open=
{
open
}
onClose=
{
handleClose
}
aria
-
labelledby=
"form-dialog-title"
>
<
DialogTitle
id=
"form-dialog-title"
>
Không duyệt? Nhập lý do!
</
DialogTitle
>
<
DialogContent
>
<
TextField
style=
{
{
marginBttom
:
20
,
minWidth
:
400
}
}
variant=
"outlined"
autoFocus
margin=
"dense"
label=
"Nhập lý do không duyệt"
fullWidth
value=
{
name
||
''
}
onChange=
{
(
event
)
=>
setName
(
event
.
target
.
value
)
}
/>
</
DialogContent
>
<
DialogActions
>
<
Button
color=
"secondary"
onClick=
{
handleClose
}
>
Thoát
</
Button
>
<
Button
onClick=
{
()
=>
{
onAgree
(
name
)
setName
(
''
)
}
}
color=
"primary"
>
Đồng ý
</
Button
>
</
DialogActions
>
</
Dialog
>
)
}
const
mapStateToProps
=
(
state
)
=>
{
return
{}
}
export
default
connect
(
mapStateToProps
,
{
showLoading
,
hideLoading
})(
FormDialog
)
This diff is collapsed.
Click to expand it.
src/app/views/GasStation/Index.js
View file @
0bf0a395
...
@@ -81,7 +81,12 @@ const ToolNotificate = (props) => {
...
@@ -81,7 +81,12 @@ const ToolNotificate = (props) => {
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
data
)
{
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
data
)
{
console
.
log
(
res
.
data
)
console
.
log
(
res
.
data
)
const
newList
=
res
.
data
.
data
.
data
.
map
((
e
,
i
)
=>
{
const
newList
=
res
.
data
.
data
.
data
.
map
((
e
,
i
)
=>
{
return
{
...
e
,
index
:
i
+
1
+
pageIndex
*
pageSize
}
return
{
...
e
,
index
:
i
+
1
+
pageIndex
*
pageSize
,
date_expried
:
e
?.
expired
?
e
?.
expired
.
substring
(
0
,
10
)
:
''
,
field
:
`
${
e
?.
total_fueld
}
tr
ụ
\
n$
{
e
?.
total_gas
}
v
ò
i
`,
}
})
})
setData(newList)
setData(newList)
...
...
This diff is collapsed.
Click to expand it.
src/app/views/GasStation/Table.js
View file @
0bf0a395
...
@@ -43,50 +43,58 @@ const columns = [
...
@@ -43,50 +43,58 @@ const columns = [
// align: 'center',
// align: 'center',
// minWidth: 50,
// minWidth: 50,
// },
// },
{
id
:
'merchant_name'
,
label
:
'Thuộc pháp nhân'
,
align
:
'left'
,
minWidth
:
160
,
},
{
{
id
:
'store_name'
,
id
:
'store_name'
,
label
:
'Tên cây xăng'
,
label
:
'Tên cây xăng'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
160
,
},
},
{
{
id
:
'
address
'
,
id
:
'
field
'
,
label
:
'
Địa chỉ
'
,
label
:
'
Trụ/vòi
'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
80
,
},
},
{
{
id
:
'
merchant_name
'
,
id
:
'
address
'
,
label
:
'
Thuộc pháp nhân
'
,
label
:
'
Địa chỉ
'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
160
,
},
},
{
{
id
:
'representative'
,
id
:
'representative'
,
label
:
'Người đại diện'
,
label
:
'Người đại diện'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
140
,
},
},
{
{
id
:
'
email
'
,
id
:
'
provice_name
'
,
label
:
'
Email
'
,
label
:
'
Tỉnh/Thành phố
'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
120
,
},
},
{
{
id
:
'
phone
'
,
id
:
'
date_expried
'
,
label
:
'
Số điện thoại
'
,
label
:
'
Ngày hết hạn
'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
100
,
},
},
{
{
id
:
'status_text'
,
id
:
'status_text'
,
label
:
'Trạng thái'
,
label
:
'Trạng thái'
,
align
:
'left'
,
align
:
'left'
,
minWidth
:
'auto'
,
minWidth
:
120
,
},
},
]
]
...
...
This diff is collapsed.
Click to expand it.
src/app/views/GasStation/detail.js
View file @
0bf0a395
...
@@ -37,6 +37,8 @@ import TableRow from '@material-ui/core/TableRow'
...
@@ -37,6 +37,8 @@ import TableRow from '@material-ui/core/TableRow'
import
Paper
from
'@material-ui/core/Paper'
import
Paper
from
'@material-ui/core/Paper'
import
{
useTranslation
}
from
'react-i18next'
import
{
useTranslation
}
from
'react-i18next'
import
AcceptStore
from
'app/components/dialog/AcceptStore'
import
RejectStore
from
'app/components/dialog/RejectStore'
const
SimpleForm
=
(
props
)
=>
{
const
SimpleForm
=
(
props
)
=>
{
const
[
state
,
setState
]
=
useState
({})
const
[
state
,
setState
]
=
useState
({})
...
@@ -47,6 +49,8 @@ const SimpleForm = (props) => {
...
@@ -47,6 +49,8 @@ const SimpleForm = (props) => {
const
[
fountainSelected
,
setFountainSelected
]
=
useState
()
const
[
fountainSelected
,
setFountainSelected
]
=
useState
()
const
[
openUpdate
,
setOpenUpdate
]
=
useState
()
const
[
openUpdate
,
setOpenUpdate
]
=
useState
()
const
[
listProvince
,
setListProvince
]
=
useState
([])
const
[
listProvince
,
setListProvince
]
=
useState
([])
const
[
openAccept
,
setOpenAccpet
]
=
useState
(
false
)
const
[
openReject
,
setOpenReject
]
=
useState
(
false
)
const
location
=
useLocation
()
const
location
=
useLocation
()
const
{
t
}
=
useTranslation
()
const
{
t
}
=
useTranslation
()
useEffect
(()
=>
{
useEffect
(()
=>
{
...
@@ -539,7 +543,7 @@ const SimpleForm = (props) => {
...
@@ -539,7 +543,7 @@ const SimpleForm = (props) => {
color
=
"secondary"
color
=
"secondary"
variant
=
"contained"
variant
=
"contained"
onClick
=
{()
=>
{
onClick
=
{()
=>
{
changeSatusStore
(
4
)
setOpenReject
(
true
)
}}
}}
>
>
<
span
<
span
...
@@ -558,12 +562,32 @@ const SimpleForm = (props) => {
...
@@ -558,12 +562,32 @@ const SimpleForm = (props) => {
color
=
"primary"
color
=
"primary"
variant
=
"contained"
variant
=
"contained"
onClick
=
{()
=>
{
onClick
=
{()
=>
{
changeSatusStore
(
1
)
setOpenAccpet
(
true
)
}}
}}
>
>
<
span
className
=
"capitalize"
>
Duy
ệ
t
<
/span
>
<
span
className
=
"capitalize"
>
Duy
ệ
t
<
/span
>
<
/Button
>
<
/Button
>
)}
)}
<
AcceptStore
open
=
{
openAccept
}
handleClose
=
{()
=>
{
setOpenAccpet
(
false
)
}}
onAgree
=
{()
=>
{
changeSatusStore
(
1
)
}}
/
>
<
RejectStore
open
=
{
openReject
}
handleClose
=
{()
=>
{
setOpenReject
(
false
)
}}
onAgree
=
{()
=>
{
changeSatusStore
(
4
)
}}
/
>
<
/Grid
>
<
/Grid
>
<
/ValidatorForm
>
<
/ValidatorForm
>
<
/SimpleCard
>
<
/SimpleCard
>
...
...
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