高级查询增加选项

src/views/OrderFollow.jsx

@@ -6,7 +6,7 @@ import {
   Divider,
   Flex, Form,
   Input,
-  Radio, Select,
+  Radio, Row, Col, Select,
   Space,
   Switch,
   Table,
@@ -55,70 +55,82 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
   }
   return (
     <Form
-      layout={'inline'}
+      layout={'vertical'}
+      // layout={'inline'}
       form={form}
-      initialValues={{ orderLabel: '', orderStatus: '',
+      initialValues={{ orderLabel: '', orderStatus: '', remindState: '',
       startDateRange: [dayjs().startOf('M'), dayjs().endOf('M')]
       }}
       onFinish={handleSubmit}
-      style={{
-        maxWidth: 'none',
-      }}
+      // style={{
+      //   maxWidth: '200',
+      // }}
     >
+    <Row justify='start' align='middle' gutter={16}>
+   <Col span={4}>
+   <Form.Item label='订单号' name='orderNumber'>
+     <Input placeholder='订单号' allowClear />
+   </Form.Item>
+   </Col>
+   <Col span={4}>
+   <Form.Item label='FirstName' name='firstName'>
+     <Input placeholder='FirstName' allowClear />
+   </Form.Item>
+   </Col>
+   <Col span={4}>
+   <Form.Item label='LastName' name='lastName'>
+     <Input placeholder='LastName' allowClear />
+   </Form.Item>
+   </Col>
+   <Col span={4}>
+   <Form.Item label='邮件地址/客人电话/传真' name='email'>
+     <Input placeholder='邮件地址/客人电话/传真' allowClear />
+   </Form.Item>
+   </Col>
+   
+ </Row>
+       <Row justify='start' align='middle' gutter={16}>
+      <Col span={2}>
       <Form.Item label='标签' name='orderLabel'>
         <Select
-          style={{
-            width: 100,
-          }}
           options={[
             { value: '', label: '全部' },
             { value: '240003', label: '重点' },
-            { value: '240002', label: '潜力' },
-            { value: '240001', label: '休眠' }
+            { value: '240002', label: '次重点' },
+            { value: '240001', label: '一般' }
           ]}
         />
       </Form.Item>
+      </Col>
+      <Col span={2}>
       <Form.Item label='状态' name='orderStatus'>
         <Select
-          style={{
-            width: 100,
-          }}
           options={[
             { value: '', label: '全部' },
-            {
-              value: '1',
-              label: '新订单',
-            },
-            {
-              value: '2',
-              label: '报价中',
-            },
-            {
-              value: '3',
-              label: '以后联系',
-            },
-            {
-              value: '4',
-              label: '等待付订金',
-            },
-            {
-              value: '5',
-              label: '成行',
-            },
-            {
-              value: '6',
-              label: '丢失',
-            },
-            {
-              value: '7',
-              label: '取消',
-            },
+            { value: '1', label: '新订单' },
+            { value: '2', label: '报价中' },
+            { value: '3', label: '以后联系' },
+            { value: '4', label: '等待付订金' },
+            { value: '5', label: '成行' },
+            { value: '6', label: '丢失' },
+            { value: '7', label: '取消' }
           ]}
         />
       </Form.Item>
-      <Form.Item label='订单号' name='orderNumber'>
-        <Input placeholder='订单号' allowClear />
+      </Col>
+      <Col span={2}>
+      <Form.Item label='催信' name='remindState'>
+        <Select
+          options={[
+            { value: '', label: '全部' },
+            { value: '1', label: '一催' },
+            { value: '2', label: '二催' },
+            { value: '3', label: '三催' }
+          ]}
+        />
       </Form.Item>
+      </Col>
+      <Col span={4}>
       <Form.Item label='出发日期' name='startDateRange'>
         <RangePicker 
           allowClear={false}
@@ -126,16 +138,28 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
           presets={DATE_PRESETS}
         />
       </Form.Item>
-      <Form.Item >
-        <Button type='primary' htmlType='submit'>搜索</Button>
+      </Col>
+      <Col span={4}>
+      <Form.Item label='确认日期' name='confirmDateRange'>
+        <RangePicker 
+          allowClear={false}
+          inputReadOnly={true}
+          presets={DATE_PRESETS}
+        />
       </Form.Item>
+      </Col>
+      <Col flex="auto">
+      {/* <Form.Item > */}
+        <Button type='primary' htmlType='submit'>搜索</Button>
+      {/* </Form.Item> */}
+      </Col>
+    </Row>
     </Form>
   )
 })
 
 function OrderList({ formValues }) {
 
-  console.info(formValues)
   const orderColumns = [
     {
       title: '订单号',
@@ -143,8 +167,8 @@ function OrderList({ formValues }) {
       width: 222,
       render: (text, record) => {
         if (record.COLI_LineGrade === 240003) return <Space>{text}<Tag color='red'>重点</Tag></Space>
-        else if (record.COLI_LineGrade === 240002) return <Space>{text}<Tag color='green'>潜力</Tag></Space>
-        else if (record.COLI_LineGrade === 240001) return <Space>{text}<Tag color='blue'>休眠</Tag></Space>
+        else if (record.COLI_LineGrade === 240002) return <Space>{text}<Tag color='green'>次重点</Tag></Space>
+        else if (record.COLI_LineGrade === 240001) return <Space>{text}<Tag color='blue'>一般</Tag></Space>
         else return <Space>{text}</Space>
       }
     },
@@ -208,6 +232,7 @@ function OrderList({ formValues }) {
       .append('enddate', thruDate)
       .append('tag', formValues.orderLabel)
       .append('orderstate', formValues.orderStatus)
+      .append('remindstate', formValues.remindState)      
       .append('coli_id', formValues.orderNumber)
       .build()
   }
@@ -317,7 +342,7 @@ function OrderFollow() {
             options={[
               { label: '今日任务', value: 'today' },
               { label: '重点订单', value: 'zhongdian' },
-              { label: '潜力客户', value: 'qianli' },
+              { label: '次重点客户', value: 'qianli' },
               { label: '成行', value: 'chengxing' },
               { label: '走团中', value: 'zoutuan' },
               { label: '走团后一月', value: 'zoutuanhou' }