.

src/pages/JobStatistics/Order/index.jsx

@@ -1,18 +1,26 @@
-import React from 'react';
-import { history } from 'umi';
-import { Button } from 'antd';
-import { getOrderList } from '@/services/order';
+import React, { useState } from 'react';
+import { Button, Modal, Form } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
+import { getOrderList } from '@/services/order';
+import { getevaluation } from '@/services/eval'
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
 };
-const getDispatch = (val) => {
-  history.push(`./dispatch.jsx?id=${val}`);
-}
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+
 export default (props) => {
+  const [show, setShow] = useState(false)
+  const [evaluation, setEval] = useState()
+  const getEvaluated = (val) => {
+    getevaluation(val).then(res => {
+      setEval(res)
+      setShow(true)
+    })
+  }
   const columns = [
     {
       title: '机构名',
@@ -56,30 +64,30 @@ export default (props) => {
       width: 200,
     },
     {
-      title: '调度状态',
-      dataIndex: 'dispatchStatus',
-      key: 'dispatchStatus',
+      title: '评价状态',
+      dataIndex: 'isEvaluated',
+      key: 'isEvaluated',
       valueType: 'select',
       valueEnum: {
         '': { text: '不限', status: 'Default' },
-        0: { text: '待调度' },
-        1: { text: '已调度' }
+        0: { text: '待评价' },
+        1: { text: '已评价' }
       },
     },
-    // {
-    //   title: '操作',
-    //   valueType: 'option',
-    //   render: (_, record) => [
-    //     <Button
-    //       style={{ padding: 0 }}
-    //       type="link"
-    //       key={2}
-    //       onClick={() => getDispatch(record.orderId)}
-    //     >
-    //       调度
-    //     </Button>
-    //   ],
-    // },
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => record.isEvaluated ? [
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={1}
+          onClick={() => getEvaluated(record.orderId)}
+        >
+          查看评价
+        </Button>
+      ] : '',
+    },
     //操作如果是需求多台机器则需调度 状态为待确认时 状态栏显示调度按钮跳到调度页面
     // 如果是申请退款 则出现处理按钮 显示需求时间 如果未到则退款并且改变已分配农机手状态和农机状态
     // 如果已经服务过了 则可以打电话给农户咨询具体情况看是否退部分款项
@@ -95,6 +103,23 @@ export default (props) => {
         options={false}
         scroll={{ x: 1000 }}
       />
+      <Modal
+        forceRender
+        title='评价'
+        visible={show}
+        onCancel={() => setShow(false)}
+        keyboard={false}
+        maskClosable={false}
+        destroyOnClose={true}
+        footer={null}
+      >
+        <Form {...formItemLayout}>
+          <FormItem label="下单人" >{evaluation?.personName}</FormItem>
+          <FormItem label="评分" >{evaluation?.score}</FormItem>
+          <FormItem label="评价内容" >{evaluation?.content}</FormItem>
+        </Form>
+      </Modal>
+
     </PageHeaderWrapper>
   );
 };

src/pages/OrderManage/dispatch.jsx

@@ -5,7 +5,7 @@ import { getOrderDetail } from '@/services/order'
 import { getMachineryList } from '@/services/machinery';
 import { history } from 'umi';
 import { getUserList } from '@/services/user';
-import { addDispatch } from '@/services/dispatch';
+import { addDispatch, getdispatchId, cancelDispatch } from '@/services/dispatch';
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
@@ -16,21 +16,25 @@ const goBack = () => {
 export default (props) => {
   const { location } = props;
   const { id } = location.query;
-  const [order, setOrder] = useState();
+  const [dispatch, setDispatch] = useState();
   const [loading, setLoading] = useState(false);
+  const [dispatchId, setDispatchId] = useState()
   const [machineryList, setMachineryList] = useState([]);
   const [userList, setUserList] = useState([])
+
+  const [cancelLoading, setCancelLoading] = useState(false);
+
   const submit = () => {
-    if (!order.machineryId) {
+    if (!dispatch.machineryId) {
       message.warning('请选择调度的农机');
       return
     }
-    if (!order.workerId) {
+    if (!dispatch.workerId) {
       message.warning('请选择农机手');
       return
     }
     setLoading(true)
-    addDispatch(order).then(res => {
+    addDispatch(dispatch).then(res => {
       message.success('调度成功');
       setLoading(false);
       goBack()
@@ -40,47 +44,67 @@ export default (props) => {
     });
   };
   const changeMachinery = (e) => {
-    setOrder({ ...order, machineryId: e })
+    setDispatch({ ...dispatch, machineryId: e })
   }
   const changeUser = (e) => {
-    setOrder({ ...order, workerId: e })
+    setDispatch({ ...dispatch, workerId: e })
+  }
+  const onCancel = () => {
+    setCancelLoading(true)
+    cancelDispatch(dispatchId).then(() => {
+      setCancelLoading(false)
+      setDispatchId()
+      setDispatch({ ...dispatch, machineryId: null, workerId: null })
+      message.success('取消成功');
+    }).catch((err) => {
+      setCancelLoading(false);
+      message.error(err.message || err);
+    });
   }
   useEffect(() => {
     getOrderDetail(id).then((res) => {
-      setOrder(res)
-      getMachineryList({ orgId: res.orgId, pageSize: 999 }).then((res2) => {
+      res.machineryId = null
+      res.typeId = res.machineryType
+      setDispatch(res)
+      getMachineryList({ orgId: res.orgId, typeId: res.typeId, pageSize: 999 }).then((res2) => {
         setMachineryList(res2.records)
       })
       getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {
         setUserList(res3.records)
       })
+      if (res.dispatchStatus == 1) {
+        getdispatchId(id).then(res4 => {
+          setDispatchId(res4.dispatchId)
+          setDispatch({ ...res, machineryId: res4.machineryId, workerId: res4.workerId })
+        })
+      }
     })
-  }, [])
+  }, [id])
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }}>
         <ProCard.TabPane key={1} tab="订单调度">
           <Form {...formItemLayout}>
             <FormItem label="客户姓名">
-              {order?.personName}
+              {dispatch?.personName}
             </FormItem>
             <FormItem label="联系电话">
-              {order?.phone}
+              {dispatch?.phone}
             </FormItem>
             <FormItem label="预约地址">
-              {order?.address}
+              {dispatch?.address}
             </FormItem>
             <FormItem label="预约时间">
-              {order?.appointmentDate}
+              {dispatch?.appointmentDate}
             </FormItem>
             <FormItem label="机构名">
-              {order?.orgName}
+              {dispatch?.orgName}
             </FormItem>
             <FormItem label="农机类型">
-              {order?.typeName}
+              {dispatch?.typeName}
             </FormItem>
             <FormItem label="农机">
-              <Select placeholder="请选择" value={order?.machineryId} onChange={changeMachinery} allowClear style={{ width: '350px' }}>
+              <Select placeholder="请选择" value={dispatch?.machineryId} onChange={changeMachinery} allowClear style={{ width: '350px' }}>
                 {machineryList.map((item) => (
                   <Option value={item.machineryId} key={item.machineryId}>
                     {item.name}
@@ -89,7 +113,7 @@ export default (props) => {
               </Select>
             </FormItem>
             <FormItem label="农机手">
-              <Select placeholder="请选择" value={order?.workerId} onChange={changeUser} allowClear style={{ width: '350px' }}>
+              <Select placeholder="请选择" value={dispatch?.workerId} onChange={changeUser} allowClear style={{ width: '350px' }}>
                 {userList.map((item) => (
                   <Option value={item.userId} key={item.userId}>
                     {item.userName}
@@ -101,9 +125,15 @@ export default (props) => {
               <Button type="default" onClick={() => goBack()}>
                 返回
               </Button>
-              <Button type="primary" loading={loading} onClick={submit} style={{ marginLeft: '4em' }}>
-                保存
-              </Button>
+              {
+                dispatchId ?
+                  <Button loading={cancelLoading} onClick={onCancel} style={{ marginLeft: '4em' }}>
+                    取消
+                  </Button> :
+                  <Button type="primary" loading={loading} onClick={submit} style={{ marginLeft: '4em' }}>
+                    保存
+                  </Button>
+              }
             </FormItem>
           </Form>
         </ProCard.TabPane>

src/services/dispatch.js

@@ -5,3 +5,17 @@ import request from '@/utils/request';
  * @returns
  */
 export const addDispatch = (data) => request('/dispatch', { method: 'post', data });
+
+/**
+ * 查询调度Id详情
+ * @param {*} params
+ * @returns
+ */
+export const getdispatchId = (id) => request(`/order/${id}/dispatch`);
+
+/**
+ * 取消调度
+ * @param {*} data
+ * @returns
+ */
+export const cancelDispatch = (id) => request(`/dispatch/${id}`, { method: 'delete' });

src/services/eval.js

@@ -0,0 +1,7 @@
+import request from '@/utils/request';
+/**
+ * 查询评价详情
+ * @param {*} params
+ * @returns
+ */
+export const getevaluation = (id) => request(`/order/${id}/evaluation`);