Skip to content

C
CmsPetrolPay
Commit 0ee66d2b by tdgiang
Options

update build

parent 21bee4ca
Showing with 992 additions and 15 deletions
src/app/App.css
......@@ -58,3 +58,7 @@ p.MuiFormHelperText-root.MuiFormHelperText-contained.Mui-error.MuiFormHelperText
.ck.ck-editor__main > .ck-editor__editable {
height: 400px !important;
}
.MuiInputBase-input.Mui-disabled {
color: black !important;
}
src/app/RootRoutes.jsx
......@@ -16,6 +16,8 @@ import FeeRouters from './views/Fee/FeeRouters'
import MerchantRoutes from './views/Merchant/MerchantRoutes'
import GasStationRoutes from './views/GasStation/GasStationRoutes'
import ListRequestRoutes from './views/ListRequest/routes'
import SignUp from './views/SignUp/routes'
const redirectRoute = [
{
path: '/',
......@@ -31,6 +33,7 @@ const errorRoute = [
]
const routes = [
...SignUp,
...ListRequestRoutes,
...GasStationRoutes,
...MerchantRoutes,
......
src/app/apis/Functions/request.js
......@@ -11,3 +11,8 @@ export const updateStatusRequest = async (body) =>
PostData(url.updateStatusRequest, body)
.then((res) => res)
.catch((err) => null)
export const detailCustomerCare = async (id, body) =>
GetURL(`${url.detailCustomerCare}/${id}`, body)
.then((res) => res)
.catch((err) => null)
src/app/apis/url.js
......@@ -95,6 +95,7 @@ export default {
listRequest: `${root}/customerCare/list`,
updateStatusRequest: `${root}/customerCare/changeStatus`,
detailCustomerCare: `${root}/customerCare`,
//dropdown
dropdownFuntions: `${root}/dropdown/function`,
dropdownPermission: `${root}/function/getFunctionTree`,
......
src/app/navigations.js
......@@ -190,7 +190,7 @@ export const navigationsAdmin = [
hide: false,
},
{
name: 'Danh sách yêu cầu',
name: 'Yêu cầu tư vấn',
path: '/list-request',
icon: 'schedule_send',
id: 'LIST-REQUEST',
......@@ -198,6 +198,14 @@ export const navigationsAdmin = [
},
{
name: 'Yêu cầu dùng thử',
path: '/sign-up',
icon: 'schedule_send',
id: 'SIGN-UP',
hide: false,
},
{
name: 'Quản lý hệ thống',
icon: 'wb_iridescent',
hide: false,
......
src/app/views/ListRequest/Index.js
......@@ -50,6 +50,7 @@ const ToolNotificate = (props) => {
page_no: 0,
page_size: pageSize,
status,
care_type: 1,
})
} else {
res = await listRequest({
......@@ -57,6 +58,7 @@ const ToolNotificate = (props) => {
page_no: pageIndex + 1,
page_size: pageSize,
status,
care_type: 1,
})
}
......
src/app/views/ListRequest/View.js
......@@ -47,7 +47,7 @@ function CustomerView(props) {
<Breadcrumb
routeSegments={[
{
name: 'Danh sách yêu cầu',
name: 'Yêu cầu tư vấn',
path: '/list-request',
},
]}
......@@ -77,7 +77,7 @@ function CustomerView(props) {
<TextField
variant="outlined"
className="w-full"
label="Tên pháp nhân"
label="Từ khoá"
onChange={(e) => {
const text = e.target.value
setTimeout(() => {
......
src/app/views/Merchant/Create.js
......@@ -30,10 +30,30 @@ const SimpleForm = (props) => {
const [payment, setPayment] = useState(false)
const [listDrop, setListDrop] = useState([])
const { t } = useTranslation()
const location = useLocation()
console.log('location.state', location.state)
useEffect(() => {
getData()
}, [])
useEffect(() => {
if (location.state) {
const { company_name, tax, phone, email, city } = location.state
setState(
{
merchant_name: company_name,
tax_code: tax,
address: city,
email,
phone_number: phone,
},
[]
)
}
}, [])
const getData = async () => {
props.showLoading()
const res = await dropdownListSupplier({})
......@@ -604,18 +624,19 @@ const SimpleForm = (props) => {
) : null}
</Grid>
<Grid container justify={'flex-end'}>
<Link to="merchant">
<Button
style={{
marginRight: 20,
}}
color="inherit"
variant="contained"
onClick={() => {}}
>
<span className="capitalize">Quay lại</span>
</Button>
</Link>
<Button
style={{
marginRight: 20,
}}
color="inherit"
variant="contained"
onClick={() => {
history.goBack()
}}
>
<span className="capitalize">Quay lại</span>
</Button>
<Button
color="primary"
variant="contained"
......
src/app/views/SignUp/Index.js 0 → 100644
import React, { useState, useEffect } from 'react'
import ToolUserView from './View'
import { listRequest, updateStatusRequest } from 'app/apis/Functions/request'
import { useHistory } from 'react-router-dom'
import KEY from '../../assets/Key'
import { connect } from 'react-redux'
import { showLoading, hideLoading } from 'app/redux/actions/loadingAction'
import { toast } from 'react-toastify'
import useDebounce from 'app/hooks/useDebounce'
import { useTranslation } from 'react-i18next'
const ToolNotificate = (props) => {
const [txtSearch, setTxtSearch] = useState('')
const searchDebount = useDebounce(txtSearch, 1000)
const [activeSelected, setActiveSeleted] = useState(null)
const [changeActive, setChangeActive] = useState(1)
const [status, setStatus] = useState()
const [pageIndex, setPageIndex] = useState(0)
const [pageSize] = useState(10)
const [totalRecords, setTotalRecord] = useState(0)
const history = useHistory()
const { t } = useTranslation()
const [data, setData] = useState([])
const [permissions, setPermissions] = useState([])
const handeChangeActive = async (id, status_id) => {
props.showLoading()
const res = await updateStatusRequest({ id: id, status_id })
props.hideLoading()
if (res.data.code == 200) {
getData()
toast.success('Thay đổi trạng thái thành công!', {
theme: 'colored',
})
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
}
const getData = async (isInit) => {
props.showLoading()
let res
if (isInit) {
setPageIndex(0)
res = await listRequest({
cus_name: searchDebount,
page_no: 0,
page_size: pageSize,
status,
care_type: 2,
})
} else {
res = await listRequest({
cus_name: searchDebount,
page_no: pageIndex + 1,
page_size: pageSize,
status,
care_type: 2,
})
}
props.hideLoading()
console.log('res', res)
if (res.data.code == 200 && res.data.data) {
console.log(res.data)
const newList = res.data.data.data.map((e, i) => {
return { ...e, index: i + 1 + pageIndex * pageSize }
})
setData(newList)
setTotalRecord(res.data.data.total_elements)
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
}
useEffect(() => {
getData(true)
}, [searchDebount, status])
useEffect(() => {
getData(false)
}, [pageIndex])
const removeItem = async (id) => {}
return (
<ToolUserView
data={data}
removeItem={removeItem}
setTxtSearch={setTxtSearch}
setActiveSeleted={setActiveSeleted}
pageIndex={pageIndex}
changeActive={changeActive}
setChangeActive={setChangeActive}
setPageIndex={setPageIndex}
activeSelected={activeSelected}
handeChangeActive={handeChangeActive}
totalRecords={totalRecords}
permissions={permissions}
status={status}
setStatus={setStatus}
/>
)
}
const mapStateToProps = (state) => {
return {}
}
export default connect(mapStateToProps, { showLoading, hideLoading })(
ToolNotificate
)
src/app/views/SignUp/Table.js 0 → 100644
import React, { useState } from 'react'
import {
Paper,
Table,
TableBody,
TableCell,
TableHead,
TableContainer,
TablePagination,
TableRow,
IconButton,
MenuItem,
Select,
Modal,
Fade,
Grid,
Backdrop,
Link,
Button,
Tooltip,
Icon,
} from '@material-ui/core'
import EditIcon from '@material-ui/icons/Edit'
import DeleteIcon from '@material-ui/icons/Delete'
import colors from '../../assets/Color'
import useStyles from '../../styles/Table'
import { Breadcrumb, SimpleCard } from 'app/components'
import DialogTransition from 'app/components/dialog/DialogTransition'
import { useHistory } from 'react-router-dom'
import useAuth from 'app/hooks/useAuth'
import { checkRole } from 'app/config/Function'
const columns = [
{
id: 'index',
label: 'STT',
align: 'center',
minWidth: 50,
},
{
id: 'cus_name',
label: 'Họ và tên',
align: 'left',
minWidth: 'auto',
},
{
id: 'phone',
label: 'Số điện thoại',
align: 'left',
minWidth: 'auto',
},
{
id: 'email',
label: 'Email',
align: 'left',
minWidth: 'auto',
},
{
id: 'tax',
label: 'Mã số thuế',
align: 'left',
minWidth: 'auto',
},
{
id: 'company_name',
label: 'Doanh nghiệp/Đơn vị ',
align: 'left',
minWidth: 'auto',
},
{
id: 'city',
label: 'Tỉnh/ Thành phố',
align: 'left',
minWidth: 'auto',
},
]
function TableList(props) {
const {
data,
handeChangeActive,
removeItem,
changeActive,
setChangeActive,
setPageIndex,
setPageSize,
pageIndex,
totalRecords,
permissions,
} = props
const classes = useStyles()
let history = useHistory()
const [selected, setSelected] = useState({
name: '',
id: '',
title: '',
content: '',
})
const [open, setOpen] = React.useState(false)
const { user } = useAuth()
const handleChangePage = (event, newPage) => {
setPageIndex(newPage)
}
const handleChangeRowsPerPage = (event) => {
setPageSize(event.target.value)
}
const handleClose = () => {
setOpen(false)
}
return (
<Paper className={classes.root}>
<TableContainer className={classes.container}>
<Table stickyHeader aria-label="sticky table">
<TableHead>
<TableRow>
{columns.map((column) => (
<TableCell
key={column.id}
align={'center'}
style={{
width: column.minWidth,
backgroundColor: colors.headerTable,
}}
>
{column.label}
</TableCell>
))}
{checkRole(user, '/merchant/changeStatus') && (
<TableCell
style={{
backgroundColor: colors.headerTable,
width: 150,
}}
>
Trạng thái
</TableCell>
)}
<TableCell
style={{
textAlign: 'center',
backgroundColor: colors.headerTable,
width: 120,
}}
>
Hành động
</TableCell>
</TableRow>
</TableHead>
<TableBody className={classes.columnTable}>
{data.map((row) => {
return (
<TableRow
hover
role="checkbox"
tabIndex={-1}
key={row.id}
>
{columns.map((column) => {
const imageUrl = row[column.id]
return (
<TableCell
key={column.id}
align={column.align}
>
{column.format ? (
<img
src={column.format(
imageUrl
)}
className={
classes.image
}
/>
) : (
imageUrl
)}
</TableCell>
)
})}
{checkRole(
user,
'/merchant/changeStatus'
) && (
<TableCell className={classes.border}>
<Select
variant={'outlined'}
labelId="demo-simple-select-placeholder-label-label"
id="demo-simple-select-placeholder-label"
onChange={(e) =>
handeChangeActive(
row.id,
e.target.value
)
}
displayEmpty
defaultValue={row.status}
className={classes.formControl}
style={{
width: 130,
}}
>
<MenuItem value={1}>
Chờ tư vấn
</MenuItem>
<MenuItem value={2}>
Đang tư vấn
</MenuItem>
<MenuItem value={3}>
Đã tư vấn
</MenuItem>
</Select>
</TableCell>
)}
<TableCell>
<Tooltip title="Chi tiết">
<IconButton
onClick={() => {
history.push({
pathname:
'/sign-up/detail',
state: row.id,
})
}}
className={classes.button}
aria-label="visibility"
>
<Icon color="primary">
visibility
</Icon>
</IconButton>
</Tooltip>
</TableCell>
</TableRow>
)
})}
</TableBody>
</Table>
</TableContainer>
<DialogTransition
data={selected}
open={open}
handleClose={handleClose}
onAgree={() => {
removeItem(selected.id)
handleClose()
}}
/>
<TablePagination
component="div"
page={pageIndex}
count={totalRecords}
rowsPerPage={10}
rowsPerPageOptions={[]}
onChangePage={handleChangePage}
onChangeRowsPerPage={handleChangeRowsPerPage}
/>
</Paper>
)
}
export default TableList
src/app/views/SignUp/View.js 0 → 100644
import React, { Fragment, useState, useEffect } from 'react'
import {
TextField,
Icon,
Button,
StepLabel,
Step,
Stepper,
Grid,
FormControl,
InputLabel,
Select,
MenuItem,
} from '@material-ui/core'
import Table from './Table'
import { Breadcrumb } from 'app/components'
import { Link } from 'react-router-dom'
import { Autocomplete, createFilterOptions } from '@material-ui/lab'
import useAuth from 'app/hooks/useAuth'
import { checkRole } from 'app/config/Function'
function CustomerView(props) {
const {
data,
updateItem,
removeItem,
setTxtSearch,
changeActive,
setChangeActive,
handeChangeActive,
setPageIndex,
pageIndex,
totalRecords,
permissions,
status,
setStatus,
} = props
const [age, setAge] = React.useState('')
const { user } = useAuth()
const handleChange = (event) => {
setAge(event.target.value)
}
return (
<Fragment>
<div className="m-sm-30">
<div className="mb-sm-30">
<Breadcrumb
routeSegments={[
{
name: 'Đăng ký dùng thử',
path: '/sign-up',
},
]}
/>
</div>
<Grid
style={{
padding: 10,
marginBottom: 20,
}}
justify={'space-between'}
alignItems={'center'}
container
spacing={3}
>
<Grid
container
spacing={3}
item
lg={8}
md={8}
sm={8}
xs={8}
>
<Grid item lg={5} md={5} sm={5} xs={5}>
<TextField
variant="outlined"
className="w-full"
label="Từ khoá"
onChange={(e) => {
const text = e.target.value
setTimeout(() => {
setTxtSearch(text)
}, 1000)
}}
/>
</Grid>
<Grid item lg={5} md={5} sm={5} xs={5}>
<FormControl variant="outlined" fullWidth>
<InputLabel htmlFor="outlined-age-native-simple">
Trạng thái
</InputLabel>
<Select
label="Trạng thái"
value={status}
onChange={(e) => setStatus(e.target.value)}
inputProps={{
name: 'age',
id: 'outlined-age-native-simple',
}}
>
<MenuItem value="">
<em>Tất cả</em>
</MenuItem>
{[
{
id: 1,
name: 'Chờ tư vấn',
},
{
id: 2,
name: 'Đang tư vấn',
},
{
id: 3,
name: 'Đã tư vấn',
},
].map((e) => (
<MenuItem value={e.id}>
{e.name}
</MenuItem>
))}
</Select>
</FormControl>
</Grid>
</Grid>
</Grid>
<Table
data={data}
changeActive={changeActive}
setChangeActive={setChangeActive}
handeChangeActive={handeChangeActive}
updateItem={updateItem}
removeItem={removeItem}
pageIndex={pageIndex}
setPageIndex={setPageIndex}
totalRecords={totalRecords}
permissions={permissions}
/>
</div>
</Fragment>
)
}
export default CustomerView
src/app/views/SignUp/detail.js 0 → 100644
import React, { useState, useEffect } from 'react'
import {
ValidatorForm,
TextValidator,
SelectValidator,
} from 'react-material-ui-form-validator'
import {
Button,
Grid,
MenuItem,
Typography,
IconButton,
Icon,
Tooltip,
} from '@material-ui/core'
import _ from 'lodash'
import { detailCustomerCare } from 'app/apis/Functions/request'
import { showLoading, hideLoading } from 'app/redux/actions/loadingAction'
import { toast } from 'react-toastify'
import { Breadcrumb, SimpleCard } from 'app/components'
import { Link, useHistory, useLocation } from 'react-router-dom'
import { trimObject } from 'app/config/Function'
import { connect } from 'react-redux'
import { dropdownMerchant } from 'app/apis/Functions/dropdown'
import Table from '@material-ui/core/Table'
import TableBody from '@material-ui/core/TableBody'
import TableCell from '@material-ui/core/TableCell'
import TableContainer from '@material-ui/core/TableContainer'
import TableHead from '@material-ui/core/TableHead'
import TableRow from '@material-ui/core/TableRow'
import Paper from '@material-ui/core/Paper'
import CreateField from 'app/components/dialog/CreateField'
import CreateFountain from 'app/components/dialog/CreateFountain'
import UpdateFountain from 'app/components/dialog/UpdateFountain'
import { useTranslation } from 'react-i18next'
const SimpleForm = (props) => {
const [state, setState] = useState({})
const history = useHistory()
const [listDrop, setListDrop] = useState([])
const [openCreate, setOpenCreate] = useState(false)
const [listField, setListField] = useState([])
const [fountainSelected, setFountainSelected] = useState()
const [openUpdate, setOpenUpdate] = useState()
const location = useLocation()
const { t } = useTranslation()
useEffect(() => {
getDateDetail()
}, [])
const getDateDetail = async () => {
props.showLoading()
const res = await detailCustomerCare(location.state, {})
props.hideLoading()
if (res.data.code == 200 && res.data.data) {
console.log(res.data.data.gas_fields)
if (res.data.data.gas_fields) {
setListField(res.data.data?.gas_fields)
}
setState(res.data.data)
} else if (res.data.code == 401) {
setTimeout(() => {
history.push('/')
}, 100)
} else {
toast.error(t(res.data.error), {
theme: 'colored',
})
}
}
const handleSubmit = async (event) => {}
const handleChange = (event) => {
event.persist()
setState({
...state,
[event.target.name]: event.target.value,
})
}
const {
cus_name,
phone,
email,
tax,
company_name,
city,
package_invoice,
list_store,
} = state
return (
<div className="m-sm-30">
<div className="mb-sm-30">
<div className="mb-sm-30">
<Breadcrumb
routeSegments={[
{
name: 'Yêu cầu dùng thử',
path: '/gas-station',
},
{ name: 'Chi tiết yêu cầu' },
]}
/>
</div>
<SimpleCard>
<ValidatorForm
id="form-create"
onSubmit={handleSubmit}
onError={() => null}
>
<Grid container spacing={3}>
<Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator
variant="outlined"
className="mb-4 w-full"
disabled={true}
label="Tên công ty"
onChange={handleChange}
type="text"
name="company_name"
value={company_name || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator
variant="outlined"
className="mb-4 w-full"
disabled={true}
label="Mã số thuế"
onChange={handleChange}
type="text"
name="tax"
value={tax || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator
variant="outlined"
className="mb-4 w-full"
disabled={true}
label="Số điện thoại"
onChange={handleChange}
type="text"
name="phone"
value={phone || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator
variant="outlined"
className="mb-4 w-full"
disabled={true}
label="Email"
onChange={handleChange}
type="text"
name="email"
value={email || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator
variant="outlined"
className="mb-4 w-full"
disabled={true}
label="Gói dịch vụ hoá đơn"
onChange={handleChange}
type="text"
name="package_invoice"
value={package_invoice || ''}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
/>
</Grid>
<Grid item lg={12} md={12} sm={12} xs={12}>
{list_store?.map((e) => {
return (
<div
style={{
borderRadius: 5,
padding: 10,
marginBottom: 20,
border: '1px solid #346D5F',
paddingBottom: 20,
}}
>
<Typography variant="h6">
{e?.store_name}
</Typography>
<Typography
style={{
marginBottom: 10,
}}
>
Địa chỉ:{e?.address}
</Typography>
<TableContainer component={Paper}>
<Table aria-label="simple table">
<TableHead>
<TableRow
style={{
backgroundColor:
'#F3F3F3',
}}
>
<TableCell
style={{
borderRight:
'0.05px solid #e0e0e0',
width: 100,
}}
align="center"
>
STT
</TableCell>
<TableCell
style={{
borderRight:
'0.05px solid #e0e0e0',
}}
align="center"
>
Loại bộ số
</TableCell>
<TableCell
style={{
borderRight:
'0.05px solid #e0e0e0',
}}
align="center"
>
Số lượng vòi
</TableCell>
</TableRow>
</TableHead>
<TableBody>
{e?.devices_main.map(
(row, index) => (
<TableRow
key={
row.name
}
>
<TableCell
component="th"
scope="row"
style={{
borderRight:
'0.05px solid #e0e0e0',
}}
align="center"
>
{index +
1}
</TableCell>
<TableCell
style={{
borderRight:
'0.05px solid #e0e0e0',
}}
align="center"
>
{
row?.device_main
}
</TableCell>
<TableCell
style={{
borderRight:
'0.05px solid #e0e0e0',
}}
align="center"
>
{
row?.gasoline_quantity
}
</TableCell>
</TableRow>
)
)}
</TableBody>
</Table>
</TableContainer>
</div>
)
})}
</Grid>
</Grid>
<Grid
style={{
marginTop: 40,
}}
container
justify={'flex-end'}
>
<Link to="gas-station">
<Button
style={{
marginRight: 20,
}}
color="inherit"
variant="contained"
onClick={() => {}}
>
<span className="capitalize">Quay lại</span>
</Button>
<Link
to={{
pathname: '/merchant/create',
state: {
phone,
email,
tax,
company_name,
city,
},
}}
>
<Button
style={{
marginRight: 20,
}}
color="primary"
variant="contained"
>
<span className="capitalize">
Thêm mới pháp nhân
</span>
</Button>
</Link>
{/* <Button
onClick={() => {
history.push({
pathname: '/merchant',
data: {
phone,
email,
tax,
company_name,
city,
},
})
}}
color="primary"
variant="contained"
>
<span className="capitalize">
Thêm mới pháp nhân
</span>
</Button> */}
</Link>
</Grid>
</ValidatorForm>
</SimpleCard>
</div>
</div>
)
}
const mapStateToProps = (state) => {
return {}
}
export default connect(mapStateToProps, { showLoading, hideLoading })(
SimpleForm
)
src/app/views/SignUp/routes.js 0 → 100644
import React from 'react'
const ListRequestRoutes = [
{
path: '/sign-up/detail',
component: React.lazy(() => import('./detail')),
},
{
path: '/sign-up',
component: React.lazy(() => import('./Index')),
},
]
export default ListRequestRoutes
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment