.

src/components/MachinetySelect/index.jsx

@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react';
+import { Select } from 'antd'
+import { getMachineryList, getMachineryDetail } from '@/services/machinery'
+
+const Option = Select.Option;
+export default (props) => {
+  const { value, onChange, ...otherProps } = props;
+
+  const [list, setList] = useState([])
+
+  const searchData = (val) => {
+    getMachineryList({ name: val, pageSize: 9999 }).then((res) => {
+      setList(res.records || [])
+    })
+  }
+
+  const handleSearch = (text) => {
+    if (text) {
+      searchData(text)
+    }
+  }
+
+  useEffect(() => {
+    if (value) {
+      getMachineryDetail(value).then((res) => {
+        setList([res])
+      })
+    }
+  }, [value])
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      defaultActiveFirstOption={false}
+      showArrow={false}
+      filterOption={false}
+      onSearch={handleSearch}
+      onChange={onChange}
+      notFoundContent={null}
+      {...otherProps}
+    >
+      {
+        list.map((item) => {
+          return (
+            <Option key={item.machineryId} value={item.machineryId}>{item.name}</Option>
+          )
+        })
+      }
+    </Select>
+  )
+}

src/components/OrgSelect/index.jsx

@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react';
+import { Select } from 'antd'
+import { getCooperativeList, getCooperativeDetail } from '@/services/cooperative'
+
+const Option = Select.Option;
+export default (props) => {
+  const { value, onChange, ...otherProps } = props;
+
+  const [list, setList] = useState([])
+
+  const searchData = (val) => {
+    getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
+      setList(res.records || [])
+    })
+  }
+
+  const handleSearch = (text) => {
+    if (text) {
+      searchData(text)
+    }
+  }
+
+  useEffect(() => {
+    if (value) {
+      getCooperativeDetail(value).then((res) => {
+        setList([res])
+      })
+    }
+  }, [value])
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      defaultActiveFirstOption={false}
+      showArrow={false}
+      filterOption={false}
+      onSearch={handleSearch}
+      onChange={onChange}
+      notFoundContent={null}
+      {...otherProps}
+    >
+      {
+        list.map((item) => {
+          return (
+            <Option key={item.orgId} value={item.orgId}>{item.name}</Option>
+          )
+        })
+      }
+    </Select>
+  )
+}

src/components/TypeSelect/index.jsx

@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react';
+import { Select } from 'antd'
+import { getMachineryTypeList, getMachineryTypeDetail } from '@/services/machineryType'
+
+const Option = Select.Option;
+export default (props) => {
+  const { value, onChange, ...otherProps } = props;
+
+  const [list, setList] = useState([])
+
+  const searchData = (val) => {
+    getMachineryTypeList({ hotelName: val, pageSize: 9999 }).then((res) => {
+      setList(res.records || [])
+    })
+  }
+
+  const handleSearch = (text) => {
+    if (text) {
+      searchData(text)
+    }
+  }
+
+  useEffect(() => {
+    if (value) {
+      getMachineryTypeDetail(value).then((res) => {
+        setList([res])
+      })
+    }
+  }, [value])
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      defaultActiveFirstOption={false}
+      showArrow={false}
+      filterOption={false}
+      onSearch={handleSearch}
+      onChange={onChange}
+      notFoundContent={null}
+      {...otherProps}
+    >
+      {
+        list.map((item) => {
+          return (
+            <Option key={item.typeId} value={item.typeId}>{item.name}</Option>
+          )
+        })
+      }
+    </Select>
+  )
+}

src/pages/OrderManage/dispatch.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Input, Button, Select, message } from 'antd';
+import { Card, Form, Button, Select, message } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import { getOrderDetail } from '@/services/order'
 import { getMachineryList, getduty } from '@/services/machinery';
@@ -69,6 +69,7 @@ export default (props) => {
     });
   }
   useEffect(() => {
+
     getOrderDetail(id).then((res) => {
       res.machineryId = null
       res.typeId = res.machineryType

src/pages/OrderManage/index.jsx

@@ -1,37 +1,100 @@
 import { history } from 'umi';
-import { Button } from 'antd';
-import { getDispatchList } from '@/services/dispatch';
+import { Button, DatePicker } from 'antd';
+import { useState, useRef } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
+import OrgSelect from '@/components/OrgSelect';
+import MachinetySelect from '@/components/MachinetySelect';
+import TypeSelect from '@/components/TypeSelect';
+import { getDispatchList } from '@/services/dispatch';
 
+const { RangePicker } = DatePicker;
 const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+  return val ? moment(val).format('YYYY-MM-DD') : '-';
 };
 const getDispatch = (val) => {
-  history.push(`./dispatch.jsx?id=${val}`);
+  history.push(`./dispatch.jsx?id=${val.orderId}&&did=${val.dispatch || null}`);
 }
+
 export default (props) => {
+  const [startDate, setStartDate] = useState()
+  const [endDate, setEndDate] = useState()
+  const handelChange = (date, dateStrings) => {
+    setStartDate(dateStrings[0])
+    setEndDate(dateStrings[1])
+  }
+
+  const ref = useRef();
+
+  const Reset = () => {
+    setStartDate()
+    setEndDate()
+    ref.current.reload();
+  }
   const columns = [
+    {
+      title: '机构',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return <OrgSelect />
+      }
+    },
+    {
+      title: '农机',
+      dataIndex: 'machineryId',
+      key: 'machineryId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <MachinetySelect />
+        )
+      }
+    },
+
     {
       title: '机构名',
       dataIndex: 'orgName',
       key: 'orgName',
+      search: false
     },
     {
       title: '农机名',
       dataIndex: 'machineryName',
       key: 'machineryName',
+      search: false
     },
     {
       title: '农机型号',
       dataIndex: 'typeName',
       key: 'typeName',
+      search: false
+    },
+    {
+      title: '农机型号',
+      dataIndex: 'typeId',
+      key: 'typeId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <TypeSelect />
+        )
+      }
+    },
+    {
+      title: '下单人手机',
+      dataIndex: 'phone',
+      key: 'phone',
+      labelWidth: 'auto'
     },
     {
       title: '需求时间',
       dataIndex: 'appointmentDate',
       key: 'appointmentDate',
+      render: (t) => formatterTime(t),
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
     },
     {
       title: '作业面积',
@@ -54,6 +117,7 @@ export default (props) => {
       render: (t) => formatterTime(t),
       width: 200,
     },
+
     {
       title: '调度状态',
       dataIndex: 'dispatchStatus',
@@ -64,6 +128,18 @@ export default (props) => {
         0: { text: '待调度' },
         1: { text: '已调度' }
       },
+      search: false
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      hideInTable: true,
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待调度' },
+        1: { text: '已调度' }
+      },
     },
     {
       title: '操作',
@@ -73,24 +149,24 @@ export default (props) => {
           style={{ padding: 0 }}
           type="link"
           key={1}
-          onClick={() => getDispatch(record.orderId)}
+          onClick={() => getDispatch(record)}
         >
           调度
         </Button>
       ],
     },
-    //操作如果是需求多台机器则需调度 状态为待确认时 状态栏显示调度按钮跳到调度页面
-    // 如果是申请退款 则出现处理按钮 显示需求时间 如果未到则退款并且改变已分配农机手状态和农机状态
-    // 如果已经服务过了 则可以打电话给农户咨询具体情况看是否退部分款项
   ];
 
   return (
     <PageHeaderWrapper>
       <PageTable
+        actionRef={ref}
         request={getDispatchList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="orderId"
+        params={{ startDate, endDate }}
+        onReset={Reset}
         options={false}
         scroll={{ x: 1000 }}
       />