.

config/routes.js

@@ -136,6 +136,12 @@ export default [
         component: './OrderManage/dispatch.jsx',
         hideInMenu: true,
       },
+      {
+        path: '/OrderManage/OrderList/index.jsx',
+        name: '订单列表',
+        access: 'orderList',
+        component: './OrderManage/OrderList',
+      },
       {
         path: '/OrderManage/JobWarning/index.jsx',
         name: '预警监管',

src/pages/JobStatistics/Order/index.jsx

@@ -3,11 +3,14 @@ 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 { getOrderList } from '@/services/order'
+import OrgSelect from '@/components/OrgSelect';
+import MachinetySelect from '@/components/MachinetySelect';
+import TypeSelect from '@/components/TypeSelect';;
 import { getevaluation } from '@/services/eval'
 
 const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+  return val ? moment(val).format('YYYY-MM-DD') : '';
 };
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
@@ -22,25 +25,71 @@ export default (props) => {
     })
   }
   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: 'typeId',
+      key: 'typeId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <TypeSelect />
+        )
+      }
+    },
     {
       title: '机构名',
       dataIndex: 'orgName',
       key: 'orgName',
+      search: false
     },
     {
       title: '农机名',
       dataIndex: 'machineryName',
       key: 'machineryName',
+      search: false
     },
     {
       title: '农机型号',
       dataIndex: 'typeName',
       key: 'typeName',
+      search: false
+    },
+    {
+      title: '下单人',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
     },
     {
       title: '需求时间',
       dataIndex: 'appointmentDate',
       key: 'appointmentDate',
+      render: (t) => formatterTime(t),
+      search: false
     },
     {
       title: '作业面积',
@@ -61,7 +110,37 @@ export default (props) => {
       key: 'createDate',
       search: false,
       render: (t) => formatterTime(t),
-      width: 200,
+    },
+    {
+      title: '付款状态',
+      dataIndex: 'payStatus',
+      key: 'payStatus',
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待付款' },
+        1: { text: '已付款' }
+      },
+    },
+    {
+      title: '调度状态',
+      dataIndex: 'dispatchStatus',
+      key: 'dispatchStatus',
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待调度' },
+        1: { text: '已调度' }
+      },
+    },
+    {
+      title: '作业状态',
+      dataIndex: 'workStatus',
+      key: 'workStatus',
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待作业' },
+        1: { text: '进行中' },
+        3: { text: '已完成' }
+      },
     },
     {
       title: '评价状态',
@@ -69,7 +148,6 @@ export default (props) => {
       key: 'isEvaluated',
       valueType: 'select',
       valueEnum: {
-        '': { text: '不限', status: 'Default' },
         0: { text: '待评价' },
         1: { text: '已评价' }
       },
@@ -101,7 +179,7 @@ export default (props) => {
         columns={columns}
         rowKey="orderId"
         options={false}
-        scroll={{ x: 1000 }}
+        scroll={{ x: 1500 }}
       />
       <Modal
         forceRender

src/pages/Machinery/Machinery/index.jsx

@@ -110,7 +110,7 @@ export default (props) => {
       key: 'jobStatus',
       search: false,
       render: (_, record) => {
-        return record.jobStatus === 1 ? '忙碌' : '空闲';
+        return record.jobStatus == 1 ? '使用中' : '空闲中';
       },
     },
     {

src/pages/OrderManage/OrderList/index.jsx

@@ -0,0 +1,145 @@
+import React, { useState } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+import { getOrderList } from '@/services/order'
+import OrgSelect from '@/components/OrgSelect';
+import MachinetySelect from '@/components/MachinetySelect';
+import TypeSelect from '@/components/TypeSelect';;
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD') : '';
+};
+const orderStates = (item) => {
+  if (item.payStatus === 0) {
+    return '待付款'
+  } else if (item.payStatus === 1 && item.workStatus === 0 && item.dispatchStatus === 0) {
+    return '已付款'
+  } else if (item.workStatus == 0 && item.dispatchStatus === 1) {
+    return '待作业'
+  } else if (item.payStatus === 1 && (item.workStatus === 1 || item.workStatus === 2)) {
+    return '进行中'
+  } else if (item.workStatus === 3 && item.isEvaluated === 0) {
+    return '待评价'
+  } if (item.workStatus === 3 && item.isEvaluated === 1) {
+    return '已完成'
+  } else if (item.payStatus === 1 && item.workStatus === 0 && item.isRefund === 1) {
+    return '已退单'
+  } else {
+    return '异常'
+  }
+}
+export default (props) => {
+  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: 'typeId',
+      key: 'typeId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <TypeSelect />
+        )
+      }
+    },
+    {
+      title: '机构名',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false
+    },
+    {
+      title: '农机名',
+      dataIndex: 'machineryName',
+      key: 'machineryName',
+      search: false
+    },
+    {
+      title: '农机型号',
+      dataIndex: 'typeName',
+      key: 'typeName',
+      search: false
+    },
+    {
+      title: '下单人',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '需求时间',
+      dataIndex: 'appointmentDate',
+      key: 'appointmentDate',
+      render: (t) => formatterTime(t),
+      search: false
+    },
+    {
+      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),
+    },
+
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      search: false,
+      render: (t, render) => orderStates(render)
+    },
+    //操作如果是需求多台机器则需调度 状态为待确认时 状态栏显示调度按钮跳到调度页面
+    // 如果是申请退款 则出现处理按钮 显示需求时间 如果未到则退款并且改变已分配农机手状态和农机状态
+    // 如果已经服务过了 则可以打电话给农户咨询具体情况看是否退部分款项
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getOrderList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="orderId"
+        options={false}
+        scroll={{ x: 1500 }}
+      />
+    </PageHeaderWrapper>
+  );
+};