Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
c2a43dab
Commit
c2a43dab
authored
Jun 15, 2023
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 去掉搜索空格
parent
c9f2e392
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
5 deletions
+23
-5
index.jsx
src/pages/EmployeeManagement/index.jsx
+4
-1
index.jsx
src/pages/StoreManagement/index.jsx
+6
-3
service.js
src/pages/StoreManagement/service.js
+1
-1
validator.js
src/utils/validator.js
+12
-0
No files found.
src/pages/EmployeeManagement/index.jsx
View file @
c2a43dab
...
...
@@ -30,6 +30,7 @@ import DepartmentModal from './components/departmentModal';
import
ViewDepartmentModal
from
'
./components/viewDepartmentModal
'
;
import
BlacklistModal
from
'
./components/blacklistModal
'
;
import
RechargeDetailsModal
from
'
./components/RechargeDetailsModal
'
;
import
{
stringOrObjectTrim
}
from
'
@/utils/utils
'
;
const
layout
=
{
labelCol
:
{
span
:
6
},
...
...
@@ -63,8 +64,10 @@ const StoreManagement = () => {
const
[
repastId
,
setRepastId
]
=
useState
(
null
);
const
shopList
=
async
params
=>
{
// 去掉前后空格
const
data
=
stringOrObjectTrim
(
params
);
setLoading
(
true
);
const
res
=
await
apiStaffList
(
params
);
const
res
=
await
apiStaffList
(
data
);
if
(
res
?.
businessCode
===
'
0000
'
)
{
const
list
=
res
.
data
?.
records
;
setTotal
(
res
.
data
.
total
);
...
...
src/pages/StoreManagement/index.jsx
View file @
c2a43dab
...
...
@@ -7,12 +7,13 @@ import { columns, repastTypeList } from './data';
import
EditRepastModal
from
'
./editRepastModal
'
;
import
AddModal
from
'
./addModal
'
;
import
styles
from
'
./index.less
'
;
import
{
stringOrObjectTrim
}
from
'
@/utils/utils
'
;
import
{
setShopList
,
setShopDelete
,
mealTypeList
,
apiEnterpriseList
,
busine
e
sTypeCheck
,
busine
s
sTypeCheck
,
}
from
'
./service.js
'
;
const
{
confirm
}
=
Modal
;
...
...
@@ -37,8 +38,10 @@ const StoreManagement = () => {
const
[
loading
,
setLoading
]
=
useState
(
false
);
const
[
selectMealType
,
setSelectMealType
]
=
useState
([]);
const
shopList
=
async
params
=>
{
// 去掉前后空格
const
data
=
stringOrObjectTrim
(
params
);
setLoading
(
true
);
const
res
=
await
setShopList
(
params
);
const
res
=
await
setShopList
(
data
);
if
(
res
?.
businessCode
===
'
0000
'
)
{
setLoading
(
false
);
setDataList
(
res
.
data
?.
records
);
...
...
@@ -151,7 +154,7 @@ const StoreManagement = () => {
};
// 添加商户
const
addShop
=
async
()
=>
{
const
res
=
await
busine
e
sTypeCheck
({
enterpriseId
:
searchForm
.
enterpriseId
});
const
res
=
await
busine
s
sTypeCheck
({
enterpriseId
:
searchForm
.
enterpriseId
});
if
(
res
.
businessCode
===
'
0000
'
)
{
setName
(
enterprise
.
label
);
setAddVisible
(
true
);
...
...
src/pages/StoreManagement/service.js
View file @
c2a43dab
...
...
@@ -84,7 +84,7 @@ export const apiSelectList = async params => {
// [企业店铺]-添加企业店铺校验是否是到店类型
// http://yapi.quantgroups.com/project/389/interface/api/65304
export
const
busine
e
sTypeCheck
=
async
params
=>
{
export
const
busine
s
sTypeCheck
=
async
params
=>
{
const
data
=
await
request
.
post
(
`
${
apiPrefix
}
/enterprise/shop/busineesType/check`
,
{
prefix
:
roleApi
,
data
:
params
,
...
...
src/utils/validator.js
View file @
c2a43dab
...
...
@@ -452,3 +452,15 @@ export const getDefaultRule = data => {
data
,
);
};
// 输入空格校验
export
const
validateSpaces
=
(
rule
,
value
,
callback
)
=>
{
// 输入不能包括空格
if
(
value
&&
value
.
includes
(
'
'
))
{
// eslint-disable-next-line prefer-promise-reject-errors
return
Promise
.
reject
(
'
输入不能为空格
'
);
}
// 去掉空格后进行进一步校验
// ...
return
Promise
.
resolve
();
};
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