Commit b920da7c authored by 武广's avatar 武广

fix: 添加校验

parent cbcb7f83
...@@ -16,7 +16,7 @@ import { apiAddrArea, apiCreatStore, apiEditStore } from '../services'; ...@@ -16,7 +16,7 @@ import { apiAddrArea, apiCreatStore, apiEditStore } from '../services';
import { weekOptions, weekDefault, layout } from '../data'; import { weekOptions, weekDefault, layout } from '../data';
import MapModal from '@/components/BaiduMap'; import MapModal from '@/components/BaiduMap';
import style from './style.less'; import style from './style.less';
// import { await } from '@umijs/deps/compiled/signale'; import { isCheckNumberLine } from '@/utils/validator';
const FormItem = Form.Item; const FormItem = Form.Item;
...@@ -209,7 +209,10 @@ const StoreModal = props => { ...@@ -209,7 +209,10 @@ const StoreModal = props => {
</FormItem> </FormItem>
<FormItem label="门店电话" name="phone"> <FormItem label="门店电话" name="phone">
{getFieldDecorator('phone', { {getFieldDecorator('phone', {
rules: [{ required: true, message: '请输入门店电话!' }], rules: [
{ required: true, message: '请输入门店电话!' },
{ validator: isCheckNumberLine, message: '请输入正确的门店电话!' },
],
initialValue: formData.phone, initialValue: formData.phone,
})(<Input placeholder="请输入门店电话" allowClear maxLength={20} />)} })(<Input placeholder="请输入门店电话" allowClear maxLength={20} />)}
</FormItem> </FormItem>
......
...@@ -127,6 +127,31 @@ export default () => { ...@@ -127,6 +127,31 @@ export default () => {
getList(); getList();
getAreaAddr(); getAreaAddr();
}, []); }, []);
const getWeekSlot = bw => {
const s = bw[0];
let e = bw[0];
const sy = [];
const htmlarr = [];
bw.forEach((item, i) => {
if (s + i === item) {
e = item;
} else {
sy.push(<span key={item}>,{weeks[item]}</span>);
}
});
if (s === e) {
htmlarr.push(<span key={s}>{weeks[s]}</span>);
} else {
htmlarr.push(
<span key={s}>
{weeks[s]} ~ {weeks[e]}
</span>,
);
}
return [...htmlarr, ...sy];
};
const columns = [ const columns = [
{ {
title: '门店名称', title: '门店名称',
...@@ -146,11 +171,7 @@ export default () => { ...@@ -146,11 +171,7 @@ export default () => {
width: 150, width: 150,
render: businessHours => ( render: businessHours => (
<div> <div>
<div> <div>{getWeekSlot(businessHours.weeks)}</div>
{businessHours.weeks.map(item => (
<span key={item}>{weeks[item]}</span>
))}
</div>
<div> <div>
{businessHours.hoursItems.map(item => ( {businessHours.hoursItems.map(item => (
<div key={item.begin}> <div key={item.begin}>
......
This diff is collapsed.
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