Skip to content

C
CmsPetrolPay
Commit 691ab984 by tdgiang
Options

update code

parent 1fd34b93
Showing with 111 additions and 26 deletions
src/app/apis/url.js
...@@ -105,12 +105,18 @@ export default { ...@@ -105,12 +105,18 @@ export default {
changeStatusInvoiceSupp: `${root}/supplierInvoice/changeStatus`, changeStatusInvoiceSupp: `${root}/supplierInvoice/changeStatus`,
//supplier //supplier
urlGetListSupplier: `${root}/supplierconstruction/paging`, // urlGetListSupplier: `${root}/supplierconstruction/paging`,
urlCreateSupplier: `${root}/supplierconstruction/create`, // urlCreateSupplier: `${root}/supplierconstruction/create`,
urlUpdateSupplier: `${root}/supplierconstruction/update`, // urlUpdateSupplier: `${root}/supplierconstruction/update`,
urlDeleteSupplier: `${root}/supplierconstruction/delete`, // urlDeleteSupplier: `${root}/supplierconstruction/delete`,
urlDetailSupplier: `${root}/supplierconstruction`, // urlDetailSupplier: `${root}/supplierconstruction`,
changeStatusSupplier: `${root}/supplierconstruction/changeStatus`, // changeStatusSupplier: `${root}/supplierconstruction/changeStatus`,
urlGetListSupplier: `${root}/provider/paging`,
urlCreateSupplier: `${root}/provider/create`,
urlUpdateSupplier: `${root}/provider/update`,
urlDeleteSupplier: `${root}/provider/delete`,
urlDetailSupplier: `${root}/provider`,
changeStatusSupplier: `${root}/provider/changeStatus`,
//Log //Log
logAuth: `${root}/logging/listLogin`, logAuth: `${root}/logging/listLogin`,
......
src/app/views/Merchant/Update.js
...@@ -99,6 +99,7 @@ const SimpleForm = (props) => { ...@@ -99,6 +99,7 @@ const SimpleForm = (props) => {
setPayment(res.data.data?.is_connect_qr) setPayment(res.data.data?.is_connect_qr)
setIsStore(res.data.data?.is_admin_store) setIsStore(res.data.data?.is_admin_store)
setAuto(res.data.data?.is_hddt_nomal) setAuto(res.data.data?.is_hddt_nomal)
} else if (res.data.code == 401) { } else if (res.data.code == 401) {
setTimeout(() => { setTimeout(() => {
history.push('/') history.push('/')
......
src/app/views/Ncc/Create.js
...@@ -39,8 +39,6 @@ const SimpleForm = (props) => { ...@@ -39,8 +39,6 @@ const SimpleForm = (props) => {
const { t } = useTranslation() const { t } = useTranslation()
console.log('user', user)
const history = useHistory() const history = useHistory()
const handleSubmit = async (event) => { const handleSubmit = async (event) => {
...@@ -48,6 +46,7 @@ const SimpleForm = (props) => { ...@@ -48,6 +46,7 @@ const SimpleForm = (props) => {
props.showLoading() props.showLoading()
const res = await createSupplier({ const res = await createSupplier({
...newValue, ...newValue,
type: parseInt(newValue?.type),
status: 1, status: 1,
}) })
console.log(res) console.log(res)
...@@ -74,7 +73,7 @@ const SimpleForm = (props) => { ...@@ -74,7 +73,7 @@ const SimpleForm = (props) => {
}) })
} }
const { supp_code, supp_name, phone, email, address } = state const { provider_code, provider_name, phone, email, address, type } = state
return ( return (
<div className="m-sm-30"> <div className="m-sm-30">
<div className="mb-sm-30"> <div className="mb-sm-30">
...@@ -92,6 +91,45 @@ const SimpleForm = (props) => { ...@@ -92,6 +91,45 @@ const SimpleForm = (props) => {
<SimpleCard> <SimpleCard>
<ValidatorForm onSubmit={handleSubmit} onError={() => null}> <ValidatorForm onSubmit={handleSubmit} onError={() => null}>
<Grid container spacing={3}> <Grid container spacing={3}>
<Grid xs={6} sm={6} item>
<SelectValidator
variant={'outlined'}
label={'Loại nhà cung cấp *'}
className="mb-4 w-full"
value={type || ''}
displayEmpty
name="type"
onChange={handleChange}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
>
{[
{
id: '0',
name: 'Cổng thanh toán',
},
{
id: '1',
name: 'Hoá đơn',
},
{
id: '2',
name: 'Nhiên liệu',
},
{
id: '3',
name: 'Thiết bị',
},
].map((e) => (
<MenuItem value={e.id}>
{e.name}
</MenuItem>
))}
</SelectValidator>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}> <Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator <TextValidator
variant="outlined" variant="outlined"
...@@ -99,8 +137,8 @@ const SimpleForm = (props) => { ...@@ -99,8 +137,8 @@ const SimpleForm = (props) => {
label="Mã nhà cung cấp *" label="Mã nhà cung cấp *"
onChange={handleChange} onChange={handleChange}
type="text" type="text"
name="supp_code" name="provider_code"
value={supp_code || ''} value={provider_code || ''}
validators={['required']} validators={['required']}
errorMessages={[ errorMessages={[
'Không được để trống trường này', 'Không được để trống trường này',
...@@ -114,8 +152,8 @@ const SimpleForm = (props) => { ...@@ -114,8 +152,8 @@ const SimpleForm = (props) => {
label="Tên nhà cung cấp *" label="Tên nhà cung cấp *"
onChange={handleChange} onChange={handleChange}
type="text" type="text"
name="supp_name" name="provider_name"
value={supp_name || ''} value={provider_name || ''}
validators={['required']} validators={['required']}
errorMessages={[ errorMessages={[
'Không được để trống trường này', 'Không được để trống trường này',
......
src/app/views/Ncc/Index.js
...@@ -31,9 +31,9 @@ const ToolNotificate = (props) => { ...@@ -31,9 +31,9 @@ const ToolNotificate = (props) => {
const [data, setData] = useState([]) const [data, setData] = useState([])
const handeChangeActive = async (idGuid, status_id) => { const handeChangeActive = async (id, status_id) => {
props.showLoading() props.showLoading()
const res = await changeStatusSupplier({ idGuid, status_id }) const res = await changeStatusSupplier({ id, status_id })
props.hideLoading() props.hideLoading()
if (res.data.code == 200) { if (res.data.code == 200) {
getData() getData()
...@@ -92,9 +92,9 @@ const ToolNotificate = (props) => { ...@@ -92,9 +92,9 @@ const ToolNotificate = (props) => {
getData(true) getData(true)
}, [searchDebount, status, store, group]) }, [searchDebount, status, store, group])
const removeItem = async (idGuid) => { const removeItem = async (id) => {
props.showLoading() props.showLoading()
const res = await deleteSupplier({ idGuid }) const res = await deleteSupplier({ id })
props.hideLoading() props.hideLoading()
if (res.data.code == 200) { if (res.data.code == 200) {
getData(true) getData(true)
......
src/app/views/Ncc/Table.js
...@@ -38,14 +38,14 @@ const columns = [ ...@@ -38,14 +38,14 @@ const columns = [
minWidth: 50, minWidth: 50,
}, },
{ {
id: 'supp_code', id: 'provider_code',
label: 'Mã nhà cung cấp', label: 'Mã nhà cung cấp',
align: 'center', align: 'center',
minWidth: 150, minWidth: 150,
}, },
{ {
id: 'supp_name', id: 'provider_name',
label: 'Tên nhà cung cấp', label: 'Tên nhà cung cấp',
align: 'left', align: 'left',
minWidth: 200, minWidth: 200,
...@@ -208,7 +208,7 @@ function TableList(props) { ...@@ -208,7 +208,7 @@ function TableList(props) {
setSelected({ setSelected({
...row, ...row,
title: 'Xóa NCC', title: 'Xóa NCC',
content: `Bạn có muốn xóa NCC thiết bị ${row.supp_name} hay không?`, content: `Bạn có muốn xóa NCC thiết bị ${row.provider_name} hay không?`,
}) })
setOpen(true) setOpen(true)
}} }}
......
src/app/views/Ncc/Update.js
...@@ -45,7 +45,7 @@ const SimpleForm = (props) => { ...@@ -45,7 +45,7 @@ const SimpleForm = (props) => {
props.showLoading() props.showLoading()
try { try {
const res = await detailSupplier(location.state, {}) const res = await detailSupplier(location.state, {})
setState(res.data.data) setState({ ...res.data.data, type: `${res.data.data.type}` })
} catch (err) { } catch (err) {
toast.error(t(err), { toast.error(t(err), {
theme: 'colored', theme: 'colored',
...@@ -60,6 +60,7 @@ const SimpleForm = (props) => { ...@@ -60,6 +60,7 @@ const SimpleForm = (props) => {
props.showLoading() props.showLoading()
const res = await updateSupplier({ const res = await updateSupplier({
...newValue, ...newValue,
type: parseInt(newValue?.type),
}) })
console.log(res) console.log(res)
props.hideLoading() props.hideLoading()
...@@ -85,7 +86,7 @@ const SimpleForm = (props) => { ...@@ -85,7 +86,7 @@ const SimpleForm = (props) => {
}) })
} }
const { supp_code, supp_name, phone, email, address } = state const { provider_code, provider_name, phone, email, address, type } = state
return ( return (
<div className="m-sm-30"> <div className="m-sm-30">
<div className="mb-sm-30"> <div className="mb-sm-30">
...@@ -103,6 +104,45 @@ const SimpleForm = (props) => { ...@@ -103,6 +104,45 @@ const SimpleForm = (props) => {
<SimpleCard> <SimpleCard>
<ValidatorForm onSubmit={handleSubmit} onError={() => null}> <ValidatorForm onSubmit={handleSubmit} onError={() => null}>
<Grid container spacing={3}> <Grid container spacing={3}>
<Grid xs={6} sm={6} item>
<SelectValidator
variant={'outlined'}
label={'Loại nhà cung cấp *'}
className="mb-4 w-full"
value={type || ''}
displayEmpty
name="type"
onChange={handleChange}
validators={['required']}
errorMessages={[
'Không được để trống trường này',
]}
>
{[
{
id: '0',
name: 'Cổng thanh toán',
},
{
id: '1',
name: 'Hoá đơn',
},
{
id: '2',
name: 'Nhiên liệu',
},
{
id: '3',
name: 'Thiết bị',
},
].map((e) => (
<MenuItem value={e.id}>
{e.name}
</MenuItem>
))}
</SelectValidator>
</Grid>
<Grid item lg={6} md={6} sm={12} xs={12}> <Grid item lg={6} md={6} sm={12} xs={12}>
<TextValidator <TextValidator
variant="outlined" variant="outlined"
...@@ -110,9 +150,9 @@ const SimpleForm = (props) => { ...@@ -110,9 +150,9 @@ const SimpleForm = (props) => {
label="Mã nhà cung cấp *" label="Mã nhà cung cấp *"
onChange={handleChange} onChange={handleChange}
type="text" type="text"
name="supp_code" name="provider_code"
disabled={true} disabled={true}
value={supp_code || ''} value={provider_code || ''}
validators={['required']} validators={['required']}
errorMessages={[ errorMessages={[
'Không được để trống trường này', 'Không được để trống trường này',
...@@ -126,8 +166,8 @@ const SimpleForm = (props) => { ...@@ -126,8 +166,8 @@ const SimpleForm = (props) => {
label="Tên nhà cung cấp *" label="Tên nhà cung cấp *"
onChange={handleChange} onChange={handleChange}
type="text" type="text"
name="supp_name" name="provider_name"
value={supp_name || ''} value={provider_name || ''}
validators={['required']} validators={['required']}
errorMessages={[ errorMessages={[
'Không được để trống trường này', 'Không được để trống trường này',
......
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