.

src/components/AMap/SearchPOI.jsx

@@ -3,7 +3,7 @@ import { useState, useEffect, useRef } from 'react'
 import loader from './loader'
 import { newMarker, autoPos, autoPoi } from './utils'
 
-const plugins = ['AMap.Scale', 'AMap.ToolBar', 'AMap.Geolocation', 'AMap.Autocomplete', 'AMap.PlaceSearch']
+const plugins = ['AMap.Scale', 'AMap.ToolBar', 'AMap.Geolocation', 'AMap.AutoComplete', 'AMap.PlaceSearch']
 
 export default (props) => {
   const { className, style, onChange, value, setAddress, setLocName, setPkLocName, setParkingAddress, roomBoole } = props
@@ -65,7 +65,7 @@ export default (props) => {
       instance.on('click', handleClick);
       map.current = instance
     }).catch((err) => {
-      console.log(err.message)
+      console.error(err)
     });
   }, [])
 

src/components/AMap/utils.js

@@ -1,4 +1,3 @@
-
 const iconNoraml = '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png';
 const iconActive = '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png';
 
@@ -8,19 +7,19 @@ export function newMarker(AMap, options = {}) {
     size: new AMap.Size(25, 34),
     image: active ? iconActive : iconNoraml,
     imageSize: new AMap.Size(25, 34),
-  })
-  const offset = new AMap.Pixel(-13, -30)
+  });
+  const offset = new AMap.Pixel(-13, -30);
 
   return new AMap.Marker({ icon, offset, ...params });
 }
 
 export function autoPos(AMap, options = {}) {
   return new AMap.Geolocation({
-    enableHighAccuracy: true,//是否使用高精度定位，默认:true
-    timeout: 10000,          //超过10秒后停止定位，默认：5s
-    buttonPosition: 'RB',    //定位按钮的停靠位置
-    buttonOffset: new AMap.Pixel(10, 20),//定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
-    zoomToAccuracy: true,   //定位成功后是否自动调整地图视野到定位点
+    enableHighAccuracy: true, //是否使用高精度定位，默认:true
+    timeout: 10000, //超过10秒后停止定位，默认：5s
+    buttonPosition: 'RB', //定位按钮的停靠位置
+    buttonOffset: new AMap.Pixel(10, 20), //定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
+    zoomToAccuracy: true, //定位成功后是否自动调整地图视野到定位点
     ...options,
   });
 }
@@ -30,22 +29,20 @@ const labelStyle = `
   border-radius: .25rem;
   background-color: white;
   box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.2);
-`
+`;
 
 export function autoPoi(map, AMap, inputRef, evt) {
-
-
-  var locationNmae = ''
+  var locationNmae = '';
 
   const markers = [];
-  const input = inputRef.current
+  const input = inputRef.current;
 
   const destroy = () => {
     if (markers.length) {
-      markers.forEach((m) => map.remove(m))
-      markers.splice(0, markers.length)
+      markers.forEach((m) => map.remove(m));
+      markers.splice(0, markers.length);
     }
-  }
+  };
 
   const handleSearchResult = (status, result) => {
     // 先清空
@@ -54,7 +51,7 @@ export function autoPoi(map, AMap, inputRef, evt) {
     const { pois } = result.poiList;
     (pois || []).forEach((poi) => {
       const { location, name } = poi;
-      const pos = `${location.lng},${location.lat}`
+      const pos = `${location.lng},${location.lat}`;
 
       const marker = newMarker(AMap, {
         map,
@@ -66,31 +63,27 @@ export function autoPoi(map, AMap, inputRef, evt) {
           name: name,
           locationNmae: locationNmae,
           position: pos,
-
-
         },
-      })
-      marker.on('click', evt.click)
-      markers.push(marker)
-    })
+      });
+      marker.on('click', evt.click);
+      markers.push(marker);
+    });
     // map.setZoom(18);
     map.setFitView();
-  }
+  };
 
   const placeSearch = new AMap.PlaceSearch({ pageSize: 20 });
-  const autoComplete = new AMap.Autocomplete({ input });
-
+  const autoComplete = new AMap.AutoComplete({ input });
 
   // 选择自动填充
-  autoComplete.on('select', e => {
-    const val = `${e.poi?.district}${e.poi?.address}`
-    locationNmae = val
-    placeSearch.setCity(e.poi.adcode)
-    placeSearch.search(e.poi.name, handleSearchResult)
-
-  })
+  autoComplete.on('select', (e) => {
+    const val = `${e.poi?.district}${e.poi?.address}`;
+    locationNmae = val;
+    placeSearch.setCity(e.poi.adcode);
+    placeSearch.search(e.poi.name, handleSearchResult);
+  });
 
-  autoComplete.on('error', (err) => console.error(err))
+  autoComplete.on('error', (err) => console.error(err));
 
   return autoComplete;
 }

src/pages/Finance/AccountLog/index.jsx

@@ -1,18 +1,35 @@
+import React, { useState, useRef } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { DatePicker } from 'antd';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getAccountLogList } from '@/services/accountLog'
 
+const { RangePicker } = DatePicker;
+
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
 };
 
+
 export default (props) => {
+  const [start, setStartDate] = useState()
+  const [end, setEndDate] = useState()
+  const handelChange = (date, dateStrings) => {
+    setStartDate(dateStrings[0])
+    setEndDate(dateStrings[1])
+  }
+  const ref = useRef();
+  const Reset = () => {
+    setStartDate()
+    setEndDate()
+    ref.current.reload();
+  }
   const columns = [
     {
       title: '发生时间',
-      dataIndex: 'payDate',
-      key: 'payDate',
+      dataIndex: 'createDate',
+      key: 'createDate',
       search: false,
       render: (t) => formatterTime(t),
     },
@@ -21,11 +38,6 @@ export default (props) => {
       dataIndex: 'personName',
       key: 'personName',
     },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
     {
       title: '订单号',
       dataIndex: 'orderNo',
@@ -50,14 +62,25 @@ export default (props) => {
         'withdraw': { text: '提现' },
       },
     },
+    //专门用来搜索
+    {
+      title: '发生时间',//结束时间
+      dataIndex: 'createDate',
+      key: 'createDate',
+      hideInTable: true,
+      render: (t, render) => formatterTime(render.createDate),
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
+    },
     {
       title: '支付方式',
-      dataIndex: 'feeType',
-      key: 'feeType',
+      dataIndex: 'payType',
+      key: 'payType',
       search: false,
       render: (_, record) => {
         return record.chargeType === 'order_refund' ? '原路返回' :
-          record.chargeType === 'withdraw' ? '银行卡转账' : ''
+          record.chargeType === 'withdraw' ? '银行卡转账' :
+            record.payType === 'wx' ? '微信' :
+              record.payType === 'zfb' ? '支付宝' : ''
       },
     },
     {
@@ -75,12 +98,14 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <PageTable
+        actionRef={ref}
         request={getAccountLogList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="logId"
         options={false}
-        scroll={{ x: 1500 }}
+        params={{ start, end }}
+        onReset={Reset}
       />
     </PageHeaderWrapper>
   );

src/pages/Finance/Withdrawal/audit.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Button } from 'antd';
+import { Card, Form, Button, message, Input } from 'antd';
 import ProCard from '@ant-design/pro-card';
-import { getWithdrawalDetail } from '@/services/withdrawal'
+import { getWithdrawalDetail, updateWithdrawal } from '@/services/withdrawal'
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { history } from 'umi';
-import TextArea from 'antd/lib/input/TextArea';
 
+const { TextArea } = Input;
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 const goBack = () => {
@@ -15,57 +16,87 @@ export default (props) => {
   const { id } = location.query;
   const [withdrawal, setWithdrawal] = useState();
   const [remarks, setRemarks] = useState()
+  const [loading, setLoading] = useState(false)
 
+  const handleAudit = (val) => {
+    if (remarks) {
+      if (val == 1 && withdrawal.amountLeft < withdrawal.money) {
+        message.success('合作社余额小于提现余额时不能提现');
+        return
+      }
+      setLoading(true)
+      updateWithdrawal(withdrawal.withdrawalId, { ...withdrawal, auditStatus: val, auditRemark: remarks }).then(() => {
+        message.success('操作成功');
+        goBack()
+      }).catch(err => {
+        console.log(err.message)
+        setLoading(false)
+      })
+    }
+    else {
+      message.success('请输入处理结果');
+    }
+  }
   useEffect(() => {
     getWithdrawalDetail(id).then((res) => {
       setWithdrawal(res)
+      setRemarks(res.auditRemark)
     }).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>
+    <PageHeaderWrapper
+      extra='合作社余额小于提现余额时不能提现'
+    >
+      <Card>
+        <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="处理结果">
+            {
+              withdrawal?.auditStatus == 0 ?
+                <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onChange={(e) => setRemarks(e.target.value)} /> :
+                remarks
+            }
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            {
+              withdrawal?.auditStatus == 0 &&
+              <>
+                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(1)}>
+                  同意
+                </Button>
+                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(2)}>
+                  拒绝
+                </Button>
+              </>
+            }
+            <Button type="default" onClick={() => goBack()}>
+              返回
+            </Button>
+          </FormItem>
+        </Form>
+      </Card>
+    </PageHeaderWrapper>
   );
 };

src/pages/Finance/Withdrawal/index.jsx

@@ -1,4 +1,6 @@
+import React, { useState, useRef } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { DatePicker } from 'antd';
 import { history } from 'umi';
 import moment from 'moment';
 import { Button } from 'antd'
@@ -11,7 +13,20 @@ const formatterTime = (val) => {
 const goAudit = (val) => {
   history.push(`./withdrawal/audit.jsx?id=${val.withdrawalId}`);
 }
+const { RangePicker } = DatePicker;
 export default (props) => {
+  const [start, setStartDate] = useState()
+  const [end, setEndDate] = useState()
+  const handelChange = (date, dateStrings) => {
+    setStartDate(dateStrings[0])
+    setEndDate(dateStrings[1])
+  }
+  const ref = useRef();
+  const Reset = () => {
+    setStartDate()
+    setEndDate()
+    ref.current.reload();
+  }
   const columns = [
     {
       title: '申请时间',
@@ -39,7 +54,7 @@ export default (props) => {
       key: 'auditStatus',
       render: (_, record) => {
         return record.auditStatus === 0 ? '未审批' :
-          record.auditStatus === 1 ? '未审批' : '拒绝'
+          record.auditStatus === 1 ? '同意' : '拒绝'
       },
       valueType: 'select',
       valueEnum: {
@@ -48,10 +63,19 @@ export default (props) => {
         '-1': { text: '拒绝' },
       },
     },
+    //专门用来搜索
+    {
+      title: '申请时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      hideInTable: true,
+      render: (t, render) => formatterTime(render.createDate),
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
+    },
     {
       title: '审批时间',
-      dataIndex: 'postedDate',
-      key: 'postedDate',
+      dataIndex: 'auditDate',
+      key: 'auditDate',
       search: false,
       render: (t) => t != '-' ? formatterTime(t) : '-',
     },
@@ -62,7 +86,7 @@ export default (props) => {
       ellipsis: true,
       render: (_, record) => [
         <Button style={{ padding: 0 }} type="link" key={1} onClick={() => goAudit(record)}>
-          审批
+          详情
         </Button>,
       ],
     },
@@ -71,11 +95,14 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <PageTable
+        actionRef={ref}
         request={getWithdrawalList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="withdrawalId"
         options={false}
+        params={{ start, end }}
+        onReset={Reset}
       />
     </PageHeaderWrapper>
   );

src/pages/JobStatistics/Job/index.jsx

@@ -126,7 +126,7 @@ export default (props) => {
       search: false,
     },
     {
-      title: '作业时间',//结束时间
+      title: '作业时间',
       dataIndex: 'endDate',
       key: 'endDate',
       render: (t, render) => formatterTime(render.startDate) + ' ~ ' + formatterTime(render.endDate),