Commit 3381b3bf authored by 张子雨's avatar 张子雨

feat: 修复餐饮类型选择问题

parent c2a43dab
...@@ -40,7 +40,6 @@ const NewEmployeeModal = props => { ...@@ -40,7 +40,6 @@ const NewEmployeeModal = props => {
}; };
const validatePhone = (_, value) => { const validatePhone = (_, value) => {
console.log(value);
const phoneRegex = /^1[3456789]\d{9}$/; const phoneRegex = /^1[3456789]\d{9}$/;
if (!value || phoneRegex.test(value)) { if (!value || phoneRegex.test(value)) {
return Promise.resolve(); return Promise.resolve();
......
...@@ -88,8 +88,8 @@ export const columns = props => [ ...@@ -88,8 +88,8 @@ export const columns = props => [
}, },
{ {
title: '修改时间', title: '修改时间',
key: 'createdAt', key: 'updatedAt',
dataIndex: 'createdAt', dataIndex: 'updatedAt',
align: 'center', align: 'center',
}, },
{ {
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Modal, Radio, Form, Space, message, Checkbox } from 'antd'; import { Modal, Radio, Form, Space, message, Checkbox } from 'antd';
import styles from '../index.less'; import styles from '../index.less';
import { apiShopUpdate, busineesTypeCheck } from '../service.js'; import { apiShopUpdate } from '../service.js';
const EditRepastModal = props => { const EditRepastModal = props => {
const [form] = Form.useForm(); const [form] = Form.useForm();
...@@ -12,25 +12,27 @@ const EditRepastModal = props => { ...@@ -12,25 +12,27 @@ const EditRepastModal = props => {
}; };
useEffect(() => { useEffect(() => {
if (selectMealType.length) { if (selectMealType.length) {
const mealTypeList = selectMealType.filter(item => item !== 4); let mealTypeList = selectMealType.filter(item => item !== 4);
mealTypeList = mealTypeList.length && Number(mealTypeList.join(','));
console.log(mealTypeList);
const store = selectMealType.includes(4) ? [4] : []; const store = selectMealType.includes(4) ? [4] : [];
form.setFieldsValue({ mealTypeList, store }); form.setFieldsValue({ mealTypeList, store });
} }
}, [selectMealType]); }, [selectMealType]);
const onOk = () => { const onOk = () => {
form.validateFields().then(async values => { form.validateFields().then(async values => {
console.log(values);
const store = values?.store || ''; const store = values?.store || '';
const mealTypeList = [...values.mealTypeList, ...store]; const mealTypeList = [values.mealTypeList, ...store];
const params = { const params = {
id, id,
mealTypeList, mealTypeList,
}; };
const res = await apiShopUpdate(params); console.log(params);
if (res.businessCode === '0000') { // const res = await apiShopUpdate(params);
message.success('修改成功'); // if (res.businessCode === '0000') {
handleCancel(true); // message.success('修改成功');
} // handleCancel(true);
// }
}); });
}; };
...@@ -48,16 +50,16 @@ const EditRepastModal = props => { ...@@ -48,16 +50,16 @@ const EditRepastModal = props => {
rules={[{ required: true, message: '请选择商户餐品类型' }]} rules={[{ required: true, message: '请选择商户餐品类型' }]}
name="mealTypeList" name="mealTypeList"
> >
<Checkbox.Group> <Radio.Group>
<Space direction="vertical"> <Space direction="vertical">
{repastType.map(item => ( {repastType.map(item => (
<Checkbox value={item.value} key={item.value}> <Radio value={item.value} key={item.value}>
{item.label} {item.label}
</Checkbox> </Radio>
))} ))}
</Space> </Space>
<p className={styles.tip}>切换餐品类型后,请及时维护商品</p> <p className={styles.tip}>切换餐品类型后,请及时维护商品</p>
</Checkbox.Group> </Radio.Group>
</Form.Item> </Form.Item>
{isStore && ( {isStore && (
<Form.Item label="是否开启餐品类型" name="store"> <Form.Item label="是否开启餐品类型" name="store">
......
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