|
|
@@ -36,9 +36,10 @@ const OrderRecords: React.FC = () => {
|
|
|
},
|
|
|
{
|
|
|
title: '公司名称',
|
|
|
- dataIndex: 'companyName',
|
|
|
- key: 'companyName',
|
|
|
+ dataIndex: ['client', 'companyName'],
|
|
|
+ key: 'client.companyName',
|
|
|
width: 200,
|
|
|
+ render: (text: string) => text || '-',
|
|
|
},
|
|
|
{
|
|
|
title: '订单编号',
|
|
|
@@ -48,9 +49,10 @@ const OrderRecords: React.FC = () => {
|
|
|
},
|
|
|
{
|
|
|
title: '联系人',
|
|
|
- dataIndex: 'contactPerson',
|
|
|
- key: 'contactPerson',
|
|
|
+ dataIndex: ['linkman', 'name'],
|
|
|
+ key: 'linkman.name',
|
|
|
width: 100,
|
|
|
+ render: (text: string) => text || '-',
|
|
|
},
|
|
|
{
|
|
|
title: '下单日期',
|
|
|
@@ -100,9 +102,10 @@ const OrderRecords: React.FC = () => {
|
|
|
},
|
|
|
{
|
|
|
title: '业务员',
|
|
|
- dataIndex: 'salesperson',
|
|
|
- key: 'salesperson',
|
|
|
+ dataIndex: ['user', 'name'],
|
|
|
+ key: 'user.name',
|
|
|
width: 100,
|
|
|
+ render: (text: string) => text || '-',
|
|
|
},
|
|
|
{
|
|
|
title: '录入时间',
|
|
|
@@ -302,7 +305,7 @@ const OrderRecords: React.FC = () => {
|
|
|
<div className="mb-6 p-4 bg-gray-50 rounded-lg">
|
|
|
<Form form={searchForm} layout="inline">
|
|
|
<Form.Item name="keyword" label="关键词">
|
|
|
- <Input placeholder="公司名称/订单编号/联系人" />
|
|
|
+ <Input placeholder="订单编号" />
|
|
|
</Form.Item>
|
|
|
<Form.Item name="orderDate" label="下单日期">
|
|
|
<RangePicker />
|
|
|
@@ -351,14 +354,6 @@ const OrderRecords: React.FC = () => {
|
|
|
destroyOnClose
|
|
|
>
|
|
|
<Form form={form} layout="vertical">
|
|
|
- <Form.Item
|
|
|
- name="companyName"
|
|
|
- label="公司名称"
|
|
|
- rules={[{ required: true, message: '请输入公司名称' }]}
|
|
|
- >
|
|
|
- <Input placeholder="请输入公司名称" />
|
|
|
- </Form.Item>
|
|
|
-
|
|
|
<Form.Item
|
|
|
name="clientId"
|
|
|
label="选择客户"
|
|
|
@@ -382,14 +377,6 @@ const OrderRecords: React.FC = () => {
|
|
|
<LinkmanSelect placeholder="请选择联系人" />
|
|
|
</Form.Item>
|
|
|
|
|
|
- <Form.Item
|
|
|
- name="contactPerson"
|
|
|
- label="联系人"
|
|
|
- rules={[{ required: true, message: '请输入联系人姓名' }]}
|
|
|
- >
|
|
|
- <Input placeholder="请输入联系人姓名" />
|
|
|
- </Form.Item>
|
|
|
-
|
|
|
<Form.Item
|
|
|
name="userId"
|
|
|
label="选择业务员"
|
|
|
@@ -398,14 +385,6 @@ const OrderRecords: React.FC = () => {
|
|
|
<UserSelect placeholder="请选择业务员" />
|
|
|
</Form.Item>
|
|
|
|
|
|
- <Form.Item
|
|
|
- name="salesperson"
|
|
|
- label="业务员姓名"
|
|
|
- rules={[{ required: true, message: '请输入业务员姓名' }]}
|
|
|
- >
|
|
|
- <Input placeholder="请输入业务员姓名" />
|
|
|
- </Form.Item>
|
|
|
-
|
|
|
<Form.Item
|
|
|
name="orderDate"
|
|
|
label="下单日期"
|