.

config/routes.js

@@ -165,6 +165,7 @@ export default [
         name: '订单详情',
         access: 'orderwarning',
         component: './OrderManage/JobWarning/detail.jsx',
+        hideInMenu: true,
       },
     ],
   },

src/pages/Finance/AccountLog/index.jsx

@@ -1,3 +1,86 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Modal, Form, Select } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+import { getAccountLogList } from '@/services/accountLog'
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const { Option } = Select;
+
 export default (props) => {
-  return <div>平台流水</div>;
+  const [show, setShow] = useState(false)
+  const [evaluation, setEval] = useState()
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [cooperativeList, setCooperativeList] = useState([]);
+
+  const columns = [
+    {
+      title: '订单号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+    },
+    {
+      title: '下单人',
+      dataIndex: 'personName',
+      key: 'personName',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '发生时间',
+      dataIndex: 'payDate',
+      key: 'payDate',
+      search: false,
+      render: (t) => formatterTime(t),
+    },
+    {
+      title: '支付方式',
+      dataIndex: 'feeType',
+      key: 'feeType',
+      search: false,
+      render: (t) => t == 1 ? '微信' : '支付宝',
+    },
+    {
+      title: '到账时间',
+      dataIndex: 'date',
+      key: 'date',
+      render: (t) => '',
+      search: false
+    },
+    {
+      title: '到账方式',
+      dataIndex: 'Type',
+      key: 'Type',
+      search: false,
+      render: (t) => '',
+    },
+    {
+      title: '费用',
+      dataIndex: 'money',
+      key: 'money',
+      render: (t) => t / 100,
+      search: false
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getAccountLogList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="logId"
+        options={false}
+        scroll={{ x: 1500 }}
+      />
+    </PageHeaderWrapper>
+  );
 };

src/pages/JobStatistics/Order/index.jsx

@@ -47,7 +47,6 @@ export default (props) => {
       title: '订单号',
       dataIndex: 'orderNo',
       key: 'orderNo',
-      search: false
     },
     {
       title: '合作社',
@@ -130,7 +129,7 @@ export default (props) => {
       search: false
     },
     {
-      title: '作业面积',
+      title: '下单面积',
       dataIndex: 'amount',
       key: 'amount',
       search: false,

src/pages/OrderManage/JobWarning/detail.jsx

@@ -24,10 +24,10 @@ export default (props) => {
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }}>
-        <ProCard.TabPane key={1} tab="订单调度">
+        <ProCard.TabPane key={1} tab="订单详情">
           <Form {...formItemLayout}>
             <FormItem label="订单号">
-              {dispatch?.personName}
+              {dispatch?.orderNo}
             </FormItem>
             <FormItem label="客户姓名">
               {dispatch?.personName}
@@ -48,10 +48,10 @@ export default (props) => {
               {dispatch?.typeName}
             </FormItem>
             <FormItem label="农机">
-              {dispatch?.machinery}
+              {dispatch?.machineryName}
             </FormItem>
             <FormItem label="农机手">
-              {dispatch?.person}
+              {dispatch?.personName}
             </FormItem>
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>

src/pages/OrderManage/OrderList/index.jsx

@@ -53,7 +53,6 @@ export default (props) => {
       title: '订单号',
       dataIndex: 'orderNo',
       key: 'orderNo',
-      search: false
     },
     {
       title: '合作社',
@@ -136,7 +135,7 @@ export default (props) => {
       search: false
     },
     {
-      title: '作业面积',
+      title: '下单面积',
       dataIndex: 'amount',
       key: 'amount',
       search: false,

src/pages/OrderManage/index.jsx

@@ -126,7 +126,7 @@ export default (props) => {
       renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
     },
     {
-      title: '作业面积',
+      title: '下单面积',
       dataIndex: 'amount',
       key: 'amount',
       search: false,

src/services/accountLog.js

@@ -0,0 +1,7 @@
+import request from '@/utils/request';
+/**
+ * 查询平台流水
+ * @param {*} params
+ * @returns
+ */
+export const getAccountLogList = (params) => request('/account-log', { params });