.

src/pages/OrderManage/dispatch.jsx

@@ -1,11 +1,11 @@
-import React, { useState } from 'react';
-import { Card, Form, Input, Button, Select } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Card, Form, Input, Button, Select, message } from 'antd';
 import ProCard from '@ant-design/pro-card';
-
+import { getOrderDetail } from '@/services/order'
 import { getMachineryList } from '@/services/machinery';
 import { history } from 'umi';
 import { getUserList } from '@/services/user';
-import { useEffect } from 'react';
+import { addDispatch } from '@/services/dispatch';
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
@@ -21,22 +21,39 @@ export default (props) => {
   const [machineryList, setMachineryList] = useState([]);
   const [userList, setUserList] = useState([])
   const submit = () => {
-    console.log(order)
+    if (!order.machineryId) {
+      message.warning('请选择调度的农机');
+      return
+    }
+    if (!order.workerId) {
+      message.warning('请选择农机手');
+      return
+    }
+    setLoading(true)
+    addDispatch(order).then(res => {
+      message.success('调度成功');
+      setLoading(false);
+      goBack()
+    }).catch((err) => {
+      setLoading(false);
+      message.error(err.message || err);
+    });
   };
   const changeMachinery = (e) => {
     setOrder({ ...order, machineryId: e })
   }
   const changeUser = (e) => {
-    setOrder({ ...order, userId: e })
+    setOrder({ ...order, workerId: e })
   }
   useEffect(() => {
-    console.log(id)
-
-    getMachineryList({ pageSize: 999 }).then((res) => {
-      setMachineryList(res.records)
-    })
-    getUserList().then(res => {
-      setUserList(res.records)
+    getOrderDetail(id).then((res) => {
+      setOrder(res)
+      getMachineryList({ orgId: res.orgId, pageSize: 999 }).then((res2) => {
+        setMachineryList(res2.records)
+      })
+      getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
+        setUserList(res3.records)
+      })
     })
   }, [])
   return (
@@ -45,7 +62,7 @@ export default (props) => {
         <ProCard.TabPane key={1} tab="订单调度">
           <Form {...formItemLayout}>
             <FormItem label="客户姓名">
-              {order?.name}
+              {order?.personName}
             </FormItem>
             <FormItem label="联系电话">
               {order?.phone}
@@ -54,7 +71,10 @@ export default (props) => {
               {order?.address}
             </FormItem>
             <FormItem label="预约时间">
-              {order?.atime}
+              {order?.appointmentDate}
+            </FormItem>
+            <FormItem label="机构名">
+              {order?.orgName}
             </FormItem>
             <FormItem label="农机类型">
               {order?.typeName}
@@ -69,7 +89,7 @@ export default (props) => {
               </Select>
             </FormItem>
             <FormItem label="农机手">
-              <Select placeholder="请选择" value={order?.userId} onChange={changeUser} allowClear style={{ width: '350px' }}>
+              <Select placeholder="请选择" value={order?.workerId} onChange={changeUser} allowClear style={{ width: '350px' }}>
                 {userList.map((item) => (
                   <Option value={item.userId} key={item.userId}>
                     {item.userName}

src/services/dispatch.js

@@ -0,0 +1,7 @@
+import request from '@/utils/request';
+/**
+ * 调度
+ * @param {*} data
+ * @returns
+ */
+export const addDispatch = (data) => request('/dispatch', { method: 'post', data });

src/services/order.js

@@ -6,3 +6,10 @@ import request from '@/utils/request';
  * @returns
  */
 export const getOrderList = (params) => request('/order', { params });
+
+/**
+ * 查询订单详情
+ * @param {*} params
+ * @returns
+ */
+export const getOrderDetail = (id) => request(`/order/${id}`);