forked from yoone/WEB
Compare commits
No commits in common. "0abe06d9dfcd7afd0bd3ed8a28e663c2bdf43d43" and "67aa6257855d9579800c9a92f9b10d6d317df3dc" have entirely different histories.
0abe06d9df
...
67aa625785
|
|
@ -393,13 +393,6 @@ const UpdateForm: React.FC<{
|
||||||
}));
|
}));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<ProFormText
|
|
||||||
name={['email']}
|
|
||||||
label="邮箱"
|
|
||||||
placeholder="请输入邮箱"
|
|
||||||
required
|
|
||||||
rules={[{ required: true, message: '请输入邮箱' }]}
|
|
||||||
/>
|
|
||||||
<ProForm.Group title="地址">
|
<ProForm.Group title="地址">
|
||||||
<ProFormText
|
<ProFormText
|
||||||
name={['address', 'country']}
|
name={['address', 'country']}
|
||||||
|
|
@ -438,8 +431,6 @@ const UpdateForm: React.FC<{
|
||||||
required
|
required
|
||||||
rules={[{ required: true, message: '请输入详细地址' }]}
|
rules={[{ required: true, message: '请输入详细地址' }]}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
</ProForm.Group>
|
</ProForm.Group>
|
||||||
<ProFormItem
|
<ProFormItem
|
||||||
name="contact"
|
name="contact"
|
||||||
|
|
|
||||||
|
|
@ -1599,14 +1599,13 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
|
||||||
phone_number,
|
phone_number,
|
||||||
phone_number_extension,
|
phone_number_extension,
|
||||||
stockPointId,
|
stockPointId,
|
||||||
email,
|
|
||||||
} = row;
|
} = row;
|
||||||
formRef?.current?.setFieldsValue({
|
formRef?.current?.setFieldsValue({
|
||||||
stockPointId,
|
stockPointId,
|
||||||
// address_id: row.id,
|
// address_id: row.id,
|
||||||
details: {
|
details: {
|
||||||
origin: {
|
origin: {
|
||||||
email_addresses:email,
|
|
||||||
address,
|
address,
|
||||||
phone_number: {
|
phone_number: {
|
||||||
phone: phone_number,
|
phone: phone_number,
|
||||||
|
|
@ -2491,11 +2490,6 @@ const AddressPicker: React.FC<{
|
||||||
`+${record.phone_number_extension} ${record.phone_number}`,
|
`+${record.phone_number_extension} ${record.phone_number}`,
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '邮箱',
|
|
||||||
dataIndex: [ 'email'],
|
|
||||||
hideInSearch: true,
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
return (
|
return (
|
||||||
<ModalForm
|
<ModalForm
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import React, { useEffect, useState, useMemo } from 'react';
|
import React, { useEffect, useState, useMemo } from 'react';
|
||||||
import { PageContainer, ProFormSelect } from '@ant-design/pro-components';
|
import { PageContainer, ProFromSelect } from '@ant-design/pro-components';
|
||||||
import { Card, Collapse, Divider, Image, Select, Space, Typography, message } from 'antd';
|
import { Card, Collapse, Divider, Image, Select, Space, Typography, message } from 'antd';
|
||||||
import { categorycontrollerGetall } from '@/servers/api/category';
|
import { categorycontrollerGetall } from '@/servers/api/category';
|
||||||
import { productcontrollerGetproductlistgrouped } from '@/servers/api/product';
|
import { productcontrollerGetproductlistgrouped } from '@/servers/api/product';
|
||||||
|
|
@ -272,7 +272,7 @@ const ProductGroupBy: React.FC = () => {
|
||||||
{categoryAttributes.map(attr => (
|
{categoryAttributes.map(attr => (
|
||||||
<div key={attr.id} style={{ display: 'flex', alignItems: 'center' }}>
|
<div key={attr.id} style={{ display: 'flex', alignItems: 'center' }}>
|
||||||
<Text style={{ width: '100px' }}>{attr.title}:</Text>
|
<Text style={{ width: '100px' }}>{attr.title}:</Text>
|
||||||
<ProFormSelect
|
<ProFromSelect
|
||||||
placeholder={`请选择${attr.title}`}
|
placeholder={`请选择${attr.title}`}
|
||||||
style={{ width: 300 }}
|
style={{ width: 300 }}
|
||||||
value={attributeFilters[attr.name] || null}
|
value={attributeFilters[attr.name] || null}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue