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
352a6310
Commit
352a6310
authored
Jun 15, 2023
by
张子雨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/storeManagement' into feature/meal-3.0
* feat/storeManagement: feat: 优化
parents
38cd8bb3
70bceed1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
data.js
src/pages/EmployeeManagement/data.js
+1
-1
index.jsx
src/pages/EmployeeManagement/index.jsx
+1
-0
index.jsx
src/pages/StoreManagement/addModal/index.jsx
+2
-2
No files found.
src/pages/EmployeeManagement/data.js
View file @
352a6310
...
@@ -50,7 +50,7 @@ export const columns = props => [
...
@@ -50,7 +50,7 @@ export const columns = props => [
key
:
'
balanceBackFlag
'
,
key
:
'
balanceBackFlag
'
,
dataIndex
:
'
balanceBackFlag
'
,
dataIndex
:
'
balanceBackFlag
'
,
align
:
'
center
'
,
align
:
'
center
'
,
render
:
_
=>
(
_
?
'
是
'
:
'
否
'
),
render
:
_
=>
(
_
?
'
正常
'
:
'
已收回
'
),
},
},
{
{
title
:
'
是否消费限额
'
,
title
:
'
是否消费限额
'
,
...
...
src/pages/EmployeeManagement/index.jsx
View file @
352a6310
...
@@ -122,6 +122,7 @@ const StoreManagement = () => {
...
@@ -122,6 +122,7 @@ const StoreManagement = () => {
setSelectedRows
([]);
setSelectedRows
([]);
break
;
break
;
case
'
rechargeDetails
'
:
case
'
rechargeDetails
'
:
setGenerateLog
([]);
setRechargeDetailsVisible
(
false
);
setRechargeDetailsVisible
(
false
);
break
;
break
;
default
:
default
:
...
...
src/pages/StoreManagement/addModal/index.jsx
View file @
352a6310
...
@@ -50,7 +50,7 @@ const AddModal = props => {
...
@@ -50,7 +50,7 @@ const AddModal = props => {
label
:
item
.
shopName
,
label
:
item
.
shopName
,
}));
}));
setOptions
(
optionData
);
setOptions
(
optionData
);
getSelectedList
();
//
getSelectedList();
}
}
};
};
...
@@ -66,7 +66,7 @@ const AddModal = props => {
...
@@ -66,7 +66,7 @@ const AddModal = props => {
<
Form
.
Item
label=
"企业名称"
>
<
Form
.
Item
label=
"企业名称"
>
<
span
>
{
name
}
</
span
>
<
span
>
{
name
}
</
span
>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
label=
"添加微店"
name=
"shopIds"
initialValue=
{
selectList
}
>
<
Form
.
Item
label=
"添加微店"
name=
"shopIds"
>
<
Select
<
Select
mode=
"multiple"
mode=
"multiple"
allowClear
allowClear
...
...
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