.

config/routes.js

@@ -129,6 +129,13 @@ export default [
         access: 'orderjob',
         component: './OrderManage',
       },
+      {
+        path: '/OrderManage/dispatch.jsx',
+        name: '调度详情',
+        access: 'orderjob',
+        component: './OrderManage/dispatch.jsx',
+        hideInMenu: true,
+      },
       {
         path: '/OrderManage/JobWarning/index.jsx',
         name: '预警监管',
@@ -156,12 +163,12 @@ export default [
         access: 'st-work',
         component: './JobStatistics/Job',
       },
-      {
-        path: '/JobStatistics/RevenueExpenditure',
-        name: '收支统计',
-        access: 'st-finance',
-        component: './JobStatistics/RevenueExpenditure',
-      },
+      // {
+      //   path: '/JobStatistics/RevenueExpenditure',
+      //   name: '收支统计',
+      //   access: 'st-finance',
+      //   component: './JobStatistics/RevenueExpenditure',
+      // },
     ],
   },
   {

src/components/Money/index.jsx

@@ -0,0 +1,29 @@
+import { InputNumber } from "antd"
+import { useEffect, useState } from "react"
+
+export default (props) => {
+
+  const { value, onChange, ...leftProps } = props
+
+  const [money, setMoney] = useState(0)
+
+  useEffect(() => {
+    setMoney(value / 100)
+  }, [value])
+
+  const handleChange = (val) => {
+    onChange(Math.floor(val * 100))
+  }
+
+  return (
+    <InputNumber
+      min='0'
+      {...leftProps}
+      value={money}
+      onChange={handleChange}
+      precision={2}
+      formatter={value => `￥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+      parser={value => value.replace(/\￥\s?|(,*)/g, '')}
+    />
+  )
+}

src/pages/Feedback/index.jsx

@@ -60,6 +60,7 @@ export default () => {
       title: '反馈内容',
       dataIndex: 'content',
       key: 'content',
+      ellipsis: true,
     },
     {
       title: '创建时间',

src/pages/JobStatistics/Order/index.jsx

@@ -1,3 +1,100 @@
+import React from 'react';
+import { history } from 'umi';
+import { Button } from 'antd';
+import { getOrderList } from '@/services/order';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+const getDispatch = (val) => {
+  history.push(`./dispatch.jsx?id=${val}`);
+}
 export default (props) => {
-  return <div>订单统计</div>;
+  const columns = [
+    {
+      title: '机构名',
+      dataIndex: 'orgName',
+      key: 'orgName',
+    },
+    {
+      title: '农机名',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
+    },
+    {
+      title: '农机型号',
+      dataIndex: 'typeName',
+      key: 'typeName',
+    },
+    {
+      title: '需求时间',
+      dataIndex: 'appointmentDate',
+      key: 'appointmentDate',
+    },
+    {
+      title: '作业面积',
+      dataIndex: 'amount',
+      key: 'amount',
+      search: false,
+    },
+    {
+      title: '费用',
+      dataIndex: 'charges',
+      key: 'charges',
+      render: (t) => t / 100,
+      search: false
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      search: false,
+      render: (t) => formatterTime(t),
+      width: 200,
+    },
+    {
+      title: '调度状态',
+      dataIndex: 'dispatchStatus',
+      key: 'dispatchStatus',
+      valueType: 'select',
+      valueEnum: {
+        '': { text: '不限', status: 'Default' },
+        0: { text: '待调度' },
+        1: { text: '已调度' }
+      },
+    },
+    // {
+    //   title: '操作',
+    //   valueType: 'option',
+    //   render: (_, record) => [
+    //     <Button
+    //       style={{ padding: 0 }}
+    //       type="link"
+    //       key={2}
+    //       onClick={() => getDispatch(record.orderId)}
+    //     >
+    //       调度
+    //     </Button>
+    //   ],
+    // },
+    //操作如果是需求多台机器则需调度 状态为待确认时 状态栏显示调度按钮跳到调度页面
+    // 如果是申请退款 则出现处理按钮 显示需求时间 如果未到则退款并且改变已分配农机手状态和农机状态
+    // 如果已经服务过了 则可以打电话给农户咨询具体情况看是否退部分款项
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getOrderList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="orderId"
+        options={false}
+        scroll={{ x: 1000 }}
+      />
+    </PageHeaderWrapper>
+  );
 };

src/pages/Machinery/Machinery/edit.jsx

@@ -4,6 +4,7 @@ import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
 import ExtendContent from '@/components/ExtendContent';
 import { UploadImage, UploadImageList } from '@/components/Upload';
+import Money from '@/components/Money';
 import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
 import { getMachineryTypeList } from '@/services/machineryType';
 import { getRegionList } from '@/services/region';
@@ -89,7 +90,7 @@ export default (props) => {
     });
     if (id) {
       getMachineryDetail(id).then((res) => {
-        form.setFieldsValue({ ...res, buyDate: moment(res.buyDate, 'YYYY-MM-DD') });
+        form.setFieldsValue({ ...res, buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null });
       });
     }
   }, [id]);
@@ -156,22 +157,8 @@ export default (props) => {
                 ))}
               </Select>
             </FormItem>
-            <FormItem label="价格" name="price" rules={[{ required: true, message: '请输入价格' }]}>
-              <InputNumber placeholder="请输入价格" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="押金"
-              name="deposit"
-              rules={[{ required: true, message: '请输入押金' }]}
-            >
-              <InputNumber placeholder="请输入押金" style={{ width: '350px' }} />
-            </FormItem>
-            <FormItem
-              label="人工费"
-              name="laborCost"
-              rules={[{ required: true, message: '请输入人工费' }]}
-            >
-              <InputNumber placeholder="请输入人工费" style={{ width: '350px' }} />
+            <FormItem label="单价" name="price" rules={[{ required: true, message: '请输入价格' }]}>
+              <Money style={{ width: '350px' }} />
             </FormItem>
             <FormItem label="购买时间" name="buyDate">
               <DatePicker format="YYYY-MM-DD" onChange={onDateChange} style={{ width: '350px' }} />

src/pages/Machinery/Machinery/index.jsx

@@ -90,21 +90,10 @@ export default (props) => {
       search: false,
     },
     {
-      title: '农机价格',
+      title: '农机单价',
       dataIndex: 'price',
       key: 'price',
-      search: false,
-    },
-    {
-      title: '人工费',
-      dataIndex: 'laborCost',
-      key: 'laborCost',
-      search: false,
-    },
-    {
-      title: '押金',
-      dataIndex: 'deposit',
-      key: 'deposit',
+      render: (t) => t / 100,
       search: false,
     },
     {

src/pages/OrderManage/dispatch.jsx

@@ -0,0 +1,93 @@
+import React, { useState } from 'react';
+import { Card, Form, Input, Button, Select } from 'antd';
+import ProCard from '@ant-design/pro-card';
+
+import { getMachineryList } from '@/services/machinery';
+import { history } from 'umi';
+import { getUserList } from '@/services/user';
+import { useEffect } from 'react';
+
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const { Option } = Select;
+const goBack = () => {
+  history.goBack();
+};
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [order, setOrder] = useState();
+  const [loading, setLoading] = useState(false);
+  const [machineryList, setMachineryList] = useState([]);
+  const [userList, setUserList] = useState([])
+  const submit = () => {
+    console.log(order)
+  };
+  const changeMachinery = (e) => {
+    setOrder({ ...order, machineryId: e })
+  }
+  const changeUser = (e) => {
+    setOrder({ ...order, userId: e })
+  }
+  useEffect(() => {
+    console.log(id)
+
+    getMachineryList({ pageSize: 999 }).then((res) => {
+      setMachineryList(res.records)
+    })
+    getUserList().then(res => {
+      setUserList(res.records)
+    })
+  }, [])
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }}>
+        <ProCard.TabPane key={1} tab="订单调度">
+          <Form {...formItemLayout}>
+            <FormItem label="客户姓名">
+              {order?.name}
+            </FormItem>
+            <FormItem label="联系电话">
+              {order?.phone}
+            </FormItem>
+            <FormItem label="预约地址">
+              {order?.address}
+            </FormItem>
+            <FormItem label="预约时间">
+              {order?.atime}
+            </FormItem>
+            <FormItem label="农机类型">
+              {order?.typeName}
+            </FormItem>
+            <FormItem label="农机">
+              <Select placeholder="请选择" value={order?.machineryId} onChange={changeMachinery} allowClear style={{ width: '350px' }}>
+                {machineryList.map((item) => (
+                  <Option value={item.machineryId} key={item.machineryId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label="农机手">
+              <Select placeholder="请选择" value={order?.userId} onChange={changeUser} allowClear style={{ width: '350px' }}>
+                {userList.map((item) => (
+                  <Option value={item.userId} key={item.userId}>
+                    {item.userName}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem label=" " colon={false}>
+              <Button type="default" onClick={() => goBack()}>
+                返回
+              </Button>
+              <Button type="primary" loading={loading} onClick={submit} style={{ marginLeft: '4em' }}>
+                保存
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  );
+};

src/pages/OrderManage/index.jsx

@@ -1,5 +1,7 @@
 import React from 'react';
-// import { getPersonList, exportPersonList } from '@/services/person';
+import { history } from 'umi';
+import { Button } from 'antd';
+import { getOrderList } from '@/services/order';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
@@ -7,13 +9,15 @@ import PageTable from '@/components/PageTable';
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
 };
-
+const getDispatch = (val) => {
+  history.push(`./dispatch.jsx?id=${val}`);
+}
 export default (props) => {
   const columns = [
     {
-      title: '订单编号',
-      dataIndex: 'orderNum',
-      key: 'orderNum',
+      title: '机构名',
+      dataIndex: 'orgName',
+      key: 'orgName',
     },
     {
       title: '农机名',
@@ -22,59 +26,59 @@ export default (props) => {
     },
     {
       title: '农机型号',
-      dataIndex: 'type',
-      key: 'type',
-    },
-    {
-      title: '农机数量',
-      dataIndex: 'machineryNum',
-      key: 'machineryNum',
+      dataIndex: 'typeName',
+      key: 'typeName',
     },
     {
       title: '需求时间',
-      dataIndex: 'appointment_date',
-      key: 'appointment_date',
+      dataIndex: 'appointmentDate',
+      key: 'appointmentDate',
     },
     {
-      title: '农机价格',
-      dataIndex: 'price',
-      key: 'price',
+      title: '作业面积',
+      dataIndex: 'amount',
+      key: 'amount',
       search: false,
     },
     {
-      title: '押金',
-      dataIndex: 'deposit',
-      key: 'deposit',
+      title: '费用',
+      dataIndex: 'charges',
+      key: 'charges',
+      render: (t) => t / 100,
+      search: false
     },
     {
-      title: '费用',
-      dataIndex: 'laborCost',
-      key: 'laborCost',
+      title: '下单时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      search: false,
+      render: (t) => formatterTime(t),
+      width: 200,
     },
     {
-      title: '状态',
-      dataIndex: 'state',
-      key: 'state',
+      title: '调度状态',
+      dataIndex: 'dispatchStatus',
+      key: 'dispatchStatus',
       valueType: 'select',
       valueEnum: {
         '': { text: '不限', status: 'Default' },
-        1: { text: '未付款' },
-        2: { text: '已付款' },
-        3: { text: '待确认' },
-        4: { text: '进行中' },
-        5: { text: '待评价' },
-        6: { text: '已评价' },
-        7: { text: '申请退款' },
-        8: { text: '已退款' },
+        0: { text: '待调度' },
+        1: { text: '已调度' }
       },
     },
     {
-      title: '下单时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      search: false,
-      render: (t) => formatterTime(t),
-      width: 200,
+      title: '操作',
+      valueType: 'option',
+      render: (_, record) => [
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={1}
+          onClick={() => getDispatch(record.orderId)}
+        >
+          调度
+        </Button>
+      ],
     },
     //操作如果是需求多台机器则需调度 状态为待确认时 状态栏显示调度按钮跳到调度页面
     // 如果是申请退款 则出现处理按钮 显示需求时间 如果未到则退款并且改变已分配农机手状态和农机状态
@@ -84,7 +88,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <PageTable
-        // request={getPersonList}
+        request={getOrderList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="orderId"

src/services/order.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request';
+
+/**
+ * 查询订单列表
+ * @param {*} params
+ * @returns
+ */
+export const getOrderList = (params) => request('/order', { params });