.

src/pages/Finance/AccountLog/index.jsx

@@ -1,11 +1,13 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { DatePicker } from 'antd';
+import { DatePicker, Select } from 'antd';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getAccountLogList } from '@/services/accountLog'
+import { getCooperativeList } from '@/services/cooperative';
 
 const { RangePicker } = DatePicker;
+const { Option } = Select;
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
@@ -15,6 +17,7 @@ const formatterTime = (val) => {
 export default (props) => {
   const [start, setStartDate] = useState()
   const [end, setEndDate] = useState()
+  const [cooperativeList, setCooperativeList] = useState([]);
   const handelChange = (date, dateStrings) => {
     setStartDate(dateStrings[0])
     setEndDate(dateStrings[1])
@@ -25,6 +28,13 @@ export default (props) => {
     setEndDate()
     ref.current.reload();
   }
+  useEffect(() => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
+      setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [])
   const columns = [
     {
       title: '发生时间',
@@ -33,10 +43,28 @@ export default (props) => {
       search: false,
       render: (t) => formatterTime(t),
     },
+    {
+      title: '合作社',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
+      }
+    },
     {
       title: '下单人',
       dataIndex: 'personName',
       key: 'personName',
+      search: false
     },
     {
       title: '订单号',

src/pages/Finance/Withdrawal/index.jsx

@@ -1,15 +1,17 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { DatePicker } from 'antd';
+import { DatePicker, Select } from 'antd';
 import { history } from 'umi';
 import moment from 'moment';
 import { Button } from 'antd'
 import PageTable from '@/components/PageTable';
 import { getWithdrawalList } from '@/services/withdrawal'
+import { getCooperativeList } from '@/services/cooperative';
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
 };
+const { Option } = Select;
 const goAudit = (val) => {
   history.push(`./withdrawal/audit.jsx?id=${val.withdrawalId}`);
 }
@@ -17,6 +19,7 @@ const { RangePicker } = DatePicker;
 export default (props) => {
   const [start, setStartDate] = useState()
   const [end, setEndDate] = useState()
+  const [cooperativeList, setCooperativeList] = useState([]);
   const handelChange = (date, dateStrings) => {
     setStartDate(dateStrings[0])
     setEndDate(dateStrings[1])
@@ -27,6 +30,13 @@ export default (props) => {
     setEndDate()
     ref.current.reload();
   }
+  useEffect(() => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
+      setCooperativeList(res.records);
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [])
   const columns = [
     {
       title: '申请时间',
@@ -35,6 +45,29 @@ export default (props) => {
       search: false,
       render: (t) => formatterTime(t),
     },
+    {
+      title: '合作社',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
+      }
+    },
+    {
+      title: '合作社',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false
+    },
     {
       title: '申请人',
       dataIndex: 'userName',
@@ -60,7 +93,7 @@ export default (props) => {
       valueEnum: {
         0: { text: '未审批' },
         1: { text: '同意' },
-        '-1': { text: '拒绝' },
+        2: { text: '拒绝' },
       },
     },
     //专门用来搜索