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
ca16b903
Commit
ca16b903
authored
Jun 29, 2023
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 解决报错问题
parent
8558d4a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
42 deletions
+41
-42
CustomerInfoCopy.jsx
src/pages/businessCustomer/components/CustomerInfoCopy.jsx
+40
-41
index.jsx
src/pages/businessCustomer/index.jsx
+1
-1
No files found.
src/pages/businessCustomer/components/CustomerInfoCopy.jsx
View file @
ca16b903
...
@@ -32,7 +32,7 @@ const RadioGroup = Radio.Group;
...
@@ -32,7 +32,7 @@ const RadioGroup = Radio.Group;
const
{
confirm
}
=
Modal
;
const
{
confirm
}
=
Modal
;
const
CustomerInfo
=
props
=>
{
const
CustomerInfo
=
props
=>
{
const
[
form
]
=
Form
.
useForm
();
const
[
form
]
=
Form
.
useForm
();
const
[
meals
,
setMeals
]
=
useState
(
{}
);
const
[
meals
,
setMeals
]
=
useState
(
[]
);
const
[
selectedMealTypes
,
setSelectedMealTypes
]
=
useState
([]);
const
[
selectedMealTypes
,
setSelectedMealTypes
]
=
useState
([]);
const
[
pickSelfList
,
setPickSelfList
]
=
useState
([]);
const
[
pickSelfList
,
setPickSelfList
]
=
useState
([]);
...
@@ -43,6 +43,9 @@ const CustomerInfo = props => {
...
@@ -43,6 +43,9 @@ const CustomerInfo = props => {
if
(
props
.
onClose
&&
typeof
props
.
onClose
===
'
function
'
)
{
if
(
props
.
onClose
&&
typeof
props
.
onClose
===
'
function
'
)
{
props
.
onClose
(
!!
index
);
props
.
onClose
(
!!
index
);
}
}
setSelectedMealTypes
([]);
setMeals
({});
form
.
setFieldsValue
({});
};
};
/*
/*
...
@@ -106,6 +109,7 @@ const CustomerInfo = props => {
...
@@ -106,6 +109,7 @@ const CustomerInfo = props => {
// notification.error({ message: '时间段不能交叉!' });
// notification.error({ message: '时间段不能交叉!' });
return
;
return
;
}
}
params
.
mealTimePeriod
=
arr
;
params
.
mealTimePeriod
=
arr
;
if
(
res
.
hideInfo
&&
res
.
hideInfo
.
length
)
{
if
(
res
.
hideInfo
&&
res
.
hideInfo
.
length
)
{
params
.
hidePrice
=
res
.
hideInfo
.
includes
(
'
hidePrice
'
)
?
1
:
0
;
params
.
hidePrice
=
res
.
hideInfo
.
includes
(
'
hidePrice
'
)
?
1
:
0
;
...
@@ -235,8 +239,7 @@ const CustomerInfo = props => {
...
@@ -235,8 +239,7 @@ const CustomerInfo = props => {
};
};
// 数据模型转换-消费限额, 转为{餐段: {餐品类型: 限额}}
// 数据模型转换-消费限额, 转为{餐段: {餐品类型: 限额}}
const
processMealLimit
=
mealLimit
=>
{
const
processMealLimit
=
mealLimit
=>
{
const
mealLimitMap
=
{};
const
mealLimitMap
=
[];
mealLimit
.
forEach
(
item
=>
{
mealLimit
.
forEach
(
item
=>
{
const
{
mealPeriodType
,
limit
}
=
item
;
const
{
mealPeriodType
,
limit
}
=
item
;
...
@@ -328,16 +331,45 @@ const CustomerInfo = props => {
...
@@ -328,16 +331,45 @@ const CustomerInfo = props => {
form
.
resetFields
();
form
.
resetFields
();
getPickSelf
();
getPickSelf
();
}
}
}
else
{
setSelectedMealTypes
([]);
setMeals
({});
form
.
setFieldsValue
({});
}
}
},
[
props
.
visible
]);
},
[
props
.
visible
]);
/*
/*
* 1. 表单结构
* 1. 表单结构
*/
*/
const
MealLimitsFormList
=
item
=>
(
<
Form
.
List
name=
"mealLimit"
key=
{
item
.
name
}
>
{
mealLimitsFields
=>
(
<>
{
Object
.
keys
(
meals
).
map
(
meal
=>
(
<
Form
.
Item
key=
{
`${mealSections[meal]}`
}
label=
{
`${mealSections[meal]}订单`
}
required
wrapperCol=
{
{
span
:
20
}
}
>
<
Form
.
List
name=
{
`limit${meal}`
}
key=
{
`${meal}limit`
}
required
wrapperCol=
{
{
span
:
20
}
}
>
{
mealLimitsFieldsList
=>
(
<
Row
key=
{
`row${meal}`
}
>
{
selectedMealTypes
.
map
((
t
,
i
)
=>
(
<
Col
span=
{
7
}
offset=
{
i
?
1
:
0
}
key=
{
t
}
>
<
MealLimit
value=
{
t
}
label=
{
mealType
[
t
]
}
name=
{
`${t}`
}
/>
</
Col
>
))
}
</
Row
>
)
}
</
Form
.
List
>
</
Form
.
Item
>
))
}
</>
)
}
</
Form
.
List
>
);
const
formItem
=
[
const
formItem
=
[
{
{
type
:
'
Form.Item
'
,
type
:
'
Form.Item
'
,
...
@@ -352,7 +384,6 @@ const CustomerInfo = props => {
...
@@ -352,7 +384,6 @@ const CustomerInfo = props => {
disabled
:
props
.
id
,
disabled
:
props
.
id
,
label
:
'
企业取餐点
'
,
label
:
'
企业取餐点
'
,
wrapperCol
:
{
span
:
20
},
wrapperCol
:
{
span
:
20
},
// todo pickselfIds
name
:
'
pickSelfIds
'
,
name
:
'
pickSelfIds
'
,
rules
:
[{
required
:
true
,
message
:
'
请选择企业取餐点
'
}],
rules
:
[{
required
:
true
,
message
:
'
请选择企业取餐点
'
}],
component
:
(
component
:
(
...
@@ -458,39 +489,7 @@ const CustomerInfo = props => {
...
@@ -458,39 +489,7 @@ const CustomerInfo = props => {
);
);
}
}
if
(
item
.
type
===
'
Form.List
'
&&
!
item
.
disabled
)
{
if
(
item
.
type
===
'
Form.List
'
&&
!
item
.
disabled
)
{
return
(
return
MealLimitsFormList
(
item
);
<
Form
.
List
name=
"mealLimit"
key=
{
item
.
name
}
>
{
fields
=>
(
<>
{
Object
.
keys
(
meals
).
map
(
meal
=>
(
<
Form
.
Item
key=
{
`${mealSections[meal]}`
}
label=
{
`${mealSections[meal]}订单`
}
required
wrapperCol=
{
{
span
:
20
}
}
>
<
Form
.
List
name=
{
`limit${meal}`
}
key=
{
`${meal}limit`
}
required
wrapperCol=
{
{
span
:
20
}
}
>
{
fs
=>
(
<
Row
key=
{
`row${meal}`
}
>
{
selectedMealTypes
.
map
((
t
,
i
)
=>
(
<
Col
span=
{
7
}
offset=
{
i
?
1
:
0
}
key=
{
t
}
>
<
MealLimit
value=
{
t
}
label=
{
mealType
[
t
]
}
name=
{
`${t}`
}
/>
</
Col
>
))
}
</
Row
>
)
}
</
Form
.
List
>
</
Form
.
Item
>
))
}
</>
)
}
</
Form
.
List
>
);
}
}
return
null
;
return
null
;
})
}
})
}
...
...
src/pages/businessCustomer/index.jsx
View file @
ca16b903
...
@@ -64,7 +64,7 @@ const BusinessCustomer = () => {
...
@@ -64,7 +64,7 @@ const BusinessCustomer = () => {
</
Button
>,
</
Button
>,
]
}
]
}
/>
/>
{
visible
&&
<
CustomerInfo
visible=
{
visible
}
id=
{
id
}
onClose=
{
onClose
}
/>
}
<
CustomerInfo
visible=
{
visible
}
id=
{
id
}
onClose=
{
onClose
}
/>
</
div
>
</
div
>
);
);
};
};
...
...
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