.

config/routes.js

@@ -215,6 +215,12 @@ export default [
         access: 'fi-withdraw',
         component: './Finance/Withdrawal',
       },
+      {
+        path: '/Finance/Withdrawal/audit.jsx',
+        name: '提现审批',
+        component: './Finance/Withdrawal/audit.jsx',
+        hideInMenu: true,
+      },
     ],
   },
   {

src/pages/Finance/AccountLog/index.jsx

@@ -1,5 +1,3 @@
-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';
@@ -8,21 +6,15 @@ 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) => {
-  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: 'payDate',
+      key: 'payDate',
+      search: false,
+      render: (t) => formatterTime(t),
     },
     {
       title: '下单人',
@@ -35,38 +27,47 @@ export default (props) => {
       key: 'phone',
     },
     {
-      title: '发生时间',
-      dataIndex: 'payDate',
-      key: 'payDate',
-      search: false,
-      render: (t) => formatterTime(t),
+      title: '订单号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+    },
+    {
+      title: '类型',
+      dataIndex: 'chargeType',
+      key: 'chargeType',
+      render: (_, record) => {
+        return record.chargeType === 'order_pay'
+          ? '订单收入'
+          : record.chargeType === 'order_refund'
+            ? '用户退款'
+            : record.chargeType === 'withdraw'
+              ? '提现' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        'order_pay': { text: '订单收入' },
+        'order_refund': { text: '用户退款' },
+        'withdraw': { text: '提现' },
+      },
     },
     {
       title: '支付方式',
       dataIndex: 'feeType',
       key: 'feeType',
       search: false,
-      render: (t) => '',
-    },
-    {
-      title: '到账时间',
-      dataIndex: 'date',
-      key: 'date',
-      render: (t) => '',
-      search: false
-    },
-    {
-      title: '到账方式',
-      dataIndex: 'Type',
-      key: 'Type',
-      search: false,
-      render: (t) => '',
+      render: (_, record) => {
+        return record.chargeType === 'order_refund' ? '原路返回' :
+          record.chargeType === 'withdraw' ? '银行卡转账' : ''
+      },
     },
     {
       title: '费用',
       dataIndex: 'money',
       key: 'money',
-      render: (t) => t / 100,
+      render: (_, record) => {
+        return record.chargeType === 'order_pay'
+          ? '+' + (record.money / 100) : '-' + (record.money / 100)
+      },
       search: false
     },
   ];

src/pages/Finance/Withdrawal/audit.jsx

@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from 'react';
+import { Card, Form, Button } from 'antd';
+import ProCard from '@ant-design/pro-card';
+import { getWithdrawalDetail } from '@/services/withdrawal'
+import { history } from 'umi';
+import TextArea from 'antd/lib/input/TextArea';
+
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const goBack = () => {
+  history.goBack();
+};
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [withdrawal, setWithdrawal] = useState();
+  const [remarks, setRemarks] = useState()
+
+  useEffect(() => {
+    getWithdrawalDetail(id).then((res) => {
+      setWithdrawal(res)
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [id])
+  return (
+    <Card>
+      <ProCard tabs={{ type: 'card' }}>
+        <ProCard.TabPane key={1} tab="提现审批">
+          <Form {...formItemLayout}>
+            <FormItem label="申请人">
+              {withdrawal?.userName}
+            </FormItem>
+            <FormItem label="联系电话">
+              {withdrawal?.phone}
+            </FormItem>
+            <FormItem label="合作社">
+              {withdrawal?.orgName}
+            </FormItem>
+            <FormItem label="合作社余额">
+              {withdrawal?.amountLeft / 100}
+            </FormItem>
+            <FormItem label="提现银行">
+              {withdrawal?.bankCard.ownerBank}
+            </FormItem>
+            <FormItem label="提现账户">
+              {withdrawal?.bankCard.cardNo}
+            </FormItem>
+            <FormItem label="申请金额">
+              {withdrawal?.money / 100}
+            </FormItem>
+            <FormItem label="处理结果">
+              <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onInput={(e) => { setRemarks(e.detail.value) }} />
+            </FormItem>
+            <FormItem label=" " colon={false}>
+              <Button type="primary" style={{ marginRight: '16px' }} onClick={() => goBack()}>
+                同意
+              </Button>
+              <Button type="primary" style={{ marginRight: '16px' }} onClick={() => goBack()}>
+                拒绝
+              </Button>
+              <Button type="default" onClick={() => goBack()}>
+                返回
+              </Button>
+            </FormItem>
+          </Form>
+        </ProCard.TabPane>
+      </ProCard>
+    </Card>
+  );
+};

src/pages/Finance/Withdrawal/index.jsx

@@ -1,3 +1,82 @@
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { history } from 'umi';
+import moment from 'moment';
+import { Button } from 'antd'
+import PageTable from '@/components/PageTable';
+import { getWithdrawalList } from '@/services/withdrawal'
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+};
+const goAudit = (val) => {
+  history.push(`./withdrawal/audit.jsx?id=${val.withdrawalId}`);
+}
 export default (props) => {
-  return <div>提现管理</div>;
+  const columns = [
+    {
+      title: '申请时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      search: false,
+      render: (t) => formatterTime(t),
+    },
+    {
+      title: '申请人',
+      dataIndex: 'userName',
+      key: 'userName',
+    },
+    {
+      title: '费用',
+      dataIndex: 'money',
+      key: 'money',
+      render: (t) => t / 100,
+      search: false
+    },
+    //未审批  同意  不同意
+    {
+      title: '审批状态',
+      dataIndex: 'auditStatus',
+      key: 'auditStatus',
+      render: (_, record) => {
+        return record.auditStatus === 0 ? '未审批' :
+          record.auditStatus === 1 ? '未审批' : '拒绝'
+      },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '未审批' },
+        1: { text: '同意' },
+        '-1': { text: '拒绝' },
+      },
+    },
+    {
+      title: '审批时间',
+      dataIndex: 'postedDate',
+      key: 'postedDate',
+      search: false,
+      render: (t) => t != '-' ? formatterTime(t) : '-',
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      ellipsis: true,
+      render: (_, record) => [
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => goAudit(record)}>
+          审批
+        </Button>,
+      ],
+    },
+  ];
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        request={getWithdrawalList}
+        // expfunc={exportPersonList}
+        columns={columns}
+        rowKey="withdrawalId"
+        options={false}
+      />
+    </PageHeaderWrapper>
+  );
 };

src/services/withdrawal.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+
+/**
+ * 审批
+ * @param {*} data
+ * @returns
+ */
+export const updateWithdrawal = (id, data) => request(`/withdrawal/${id}`, { method: 'put', data });
+
+/**
+ * 查询提现列表
+ * @param {*} params
+ * @returns
+ */
+export const getWithdrawalList = (params) => request('/withdrawal', { params });
+/**
+ * 查询提现详情
+ */
+export const getWithdrawalDetail = (id) => request(`/withdrawal/${id}`);