李志伟 3 年前
父节点
当前提交
251dced259

+ 1
- 0
config/routes.js 查看文件

165
         name: '订单详情',
165
         name: '订单详情',
166
         access: 'orderwarning',
166
         access: 'orderwarning',
167
         component: './OrderManage/JobWarning/detail.jsx',
167
         component: './OrderManage/JobWarning/detail.jsx',
168
+        hideInMenu: true,
168
       },
169
       },
169
     ],
170
     ],
170
   },
171
   },

+ 84
- 1
src/pages/Finance/AccountLog/index.jsx 查看文件

1
+import React, { useState, useEffect } from 'react';
2
+import { Button, Modal, Form, Select } from 'antd';
3
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
4
+import moment from 'moment';
5
+import PageTable from '@/components/PageTable';
6
+import { getAccountLogList } from '@/services/accountLog'
7
+
8
+const formatterTime = (val) => {
9
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
10
+};
11
+const FormItem = Form.Item;
12
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
13
+const { Option } = Select;
14
+
1
 export default (props) => {
15
 export default (props) => {
2
-  return <div>平台流水</div>;
16
+  const [show, setShow] = useState(false)
17
+  const [evaluation, setEval] = useState()
18
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
19
+  const [cooperativeList, setCooperativeList] = useState([]);
20
+
21
+  const columns = [
22
+    {
23
+      title: '订单号',
24
+      dataIndex: 'orderNo',
25
+      key: 'orderNo',
26
+    },
27
+    {
28
+      title: '下单人',
29
+      dataIndex: 'personName',
30
+      key: 'personName',
31
+    },
32
+    {
33
+      title: '手机号',
34
+      dataIndex: 'phone',
35
+      key: 'phone',
36
+    },
37
+    {
38
+      title: '发生时间',
39
+      dataIndex: 'payDate',
40
+      key: 'payDate',
41
+      search: false,
42
+      render: (t) => formatterTime(t),
43
+    },
44
+    {
45
+      title: '支付方式',
46
+      dataIndex: 'feeType',
47
+      key: 'feeType',
48
+      search: false,
49
+      render: (t) => t == 1 ? '微信' : '支付宝',
50
+    },
51
+    {
52
+      title: '到账时间',
53
+      dataIndex: 'date',
54
+      key: 'date',
55
+      render: (t) => '',
56
+      search: false
57
+    },
58
+    {
59
+      title: '到账方式',
60
+      dataIndex: 'Type',
61
+      key: 'Type',
62
+      search: false,
63
+      render: (t) => '',
64
+    },
65
+    {
66
+      title: '费用',
67
+      dataIndex: 'money',
68
+      key: 'money',
69
+      render: (t) => t / 100,
70
+      search: false
71
+    },
72
+  ];
73
+
74
+  return (
75
+    <PageHeaderWrapper>
76
+      <PageTable
77
+        request={getAccountLogList}
78
+        // expfunc={exportPersonList}
79
+        columns={columns}
80
+        rowKey="logId"
81
+        options={false}
82
+        scroll={{ x: 1500 }}
83
+      />
84
+    </PageHeaderWrapper>
85
+  );
3
 };
86
 };

+ 1
- 2
src/pages/JobStatistics/Order/index.jsx 查看文件

47
       title: '订单号',
47
       title: '订单号',
48
       dataIndex: 'orderNo',
48
       dataIndex: 'orderNo',
49
       key: 'orderNo',
49
       key: 'orderNo',
50
-      search: false
51
     },
50
     },
52
     {
51
     {
53
       title: '合作社',
52
       title: '合作社',
130
       search: false
129
       search: false
131
     },
130
     },
132
     {
131
     {
133
-      title: '作业面积',
132
+      title: '下单面积',
134
       dataIndex: 'amount',
133
       dataIndex: 'amount',
135
       key: 'amount',
134
       key: 'amount',
136
       search: false,
135
       search: false,

+ 4
- 4
src/pages/OrderManage/JobWarning/detail.jsx 查看文件

24
   return (
24
   return (
25
     <Card>
25
     <Card>
26
       <ProCard tabs={{ type: 'card' }}>
26
       <ProCard tabs={{ type: 'card' }}>
27
-        <ProCard.TabPane key={1} tab="订单调度">
27
+        <ProCard.TabPane key={1} tab="订单详情">
28
           <Form {...formItemLayout}>
28
           <Form {...formItemLayout}>
29
             <FormItem label="订单号">
29
             <FormItem label="订单号">
30
-              {dispatch?.personName}
30
+              {dispatch?.orderNo}
31
             </FormItem>
31
             </FormItem>
32
             <FormItem label="客户姓名">
32
             <FormItem label="客户姓名">
33
               {dispatch?.personName}
33
               {dispatch?.personName}
48
               {dispatch?.typeName}
48
               {dispatch?.typeName}
49
             </FormItem>
49
             </FormItem>
50
             <FormItem label="农机">
50
             <FormItem label="农机">
51
-              {dispatch?.machinery}
51
+              {dispatch?.machineryName}
52
             </FormItem>
52
             </FormItem>
53
             <FormItem label="农机手">
53
             <FormItem label="农机手">
54
-              {dispatch?.person}
54
+              {dispatch?.personName}
55
             </FormItem>
55
             </FormItem>
56
             <FormItem label=" " colon={false}>
56
             <FormItem label=" " colon={false}>
57
               <Button type="default" onClick={() => goBack()}>
57
               <Button type="default" onClick={() => goBack()}>

+ 1
- 2
src/pages/OrderManage/OrderList/index.jsx 查看文件

53
       title: '订单号',
53
       title: '订单号',
54
       dataIndex: 'orderNo',
54
       dataIndex: 'orderNo',
55
       key: 'orderNo',
55
       key: 'orderNo',
56
-      search: false
57
     },
56
     },
58
     {
57
     {
59
       title: '合作社',
58
       title: '合作社',
136
       search: false
135
       search: false
137
     },
136
     },
138
     {
137
     {
139
-      title: '作业面积',
138
+      title: '下单面积',
140
       dataIndex: 'amount',
139
       dataIndex: 'amount',
141
       key: 'amount',
140
       key: 'amount',
142
       search: false,
141
       search: false,

+ 1
- 1
src/pages/OrderManage/index.jsx 查看文件

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

+ 7
- 0
src/services/accountLog.js 查看文件

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