commit

src/pages/fundManagement/AccountDetail.jsx

@@ -111,7 +111,7 @@ function header(props) {
                             <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
                                 <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
                             </Button>
-                            <Button >返回</Button>
+                            <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>
                     </div>
                 }

src/pages/fundManagement/AccountManagement.jsx

@@ -107,9 +107,9 @@ function header(props) {
             width: '120px',
             render: (x, row) => (
                 <>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge onClick={() => getList({ pageNum: 1, pageSize: 10 })} orgId={row.orgId} accountId={row.accountId} /></span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge onClick={handleReset} orgId={row.orgId} accountId={row.accountId} /></span>
                     <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
-                        <Refund orgId={row.orgId} accountId={row.accountId} onClick={() => getList({ pageNum: 1, pageSize: 10 })} realBalance={row.realBalance || '0'} />
+                        <Refund orgId={row.orgId} accountId={row.accountId} onClick={handleReset} realBalance={row.realBalance || '0'} />
                     </span>
                 </>
             ),

src/pages/fundManagement/ConsumeOrder.jsx

@@ -148,7 +148,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.consumeOrderExport, params: { itemType: 'redPacket', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RechargeOrder.jsx

@@ -141,7 +141,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.rechargeOrderExport, params: { itemType: 'recharge', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.rechargeOrderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RefundOrder.jsx

@@ -117,14 +117,14 @@ function header(props) {
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == '0' ? '已申请' : row.tradingStatus == '1' ? '已退款' : '已驳回'}</span></>
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '已申请' : row.tradingStatus == 'success' ? '已退款' : row.tradingStatus == 'fail' ? '已驳回' : ''}</span></>
         },
         {
             title: '驳回原因',
             dataIndex: 'auditResult',
             key: 'auditResult',
             align: 'center',
-            render: (x, row) => <>{row.tradingStatus == '2' && <span>{row.auditResult}</span>}</>
+            render: (x, row) => <>{row.tradingStatus == 'fail' && <span>{row.auditResult}</span>}</>
         },
         {
             title: '退款凭证',
@@ -244,7 +244,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.refundOrderExport, params: { itemType: 'refund', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.refundOrderExport, params: { orderType: 'refund', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/components/Recharge.jsx

@@ -34,7 +34,7 @@ const SelectContact = props => {
     const handleOk = (e) => {
         props.form.validateFieldsAndScroll((err, values) => {
             console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
-            
+
             if (!err) {
                 request({ ...apis.fund.recharge, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
                     message.info("操作成功")
@@ -48,6 +48,7 @@ const SelectContact = props => {
     }
 
     const { getFieldDecorator } = props.form;
+    const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
         <div>
             <span onClick={() => setVisible(true)}>{group.groupName}</span>
@@ -68,7 +69,14 @@ const SelectContact = props => {
 
                         <Form.Item label="充值金额" >
                             {getFieldDecorator('rechargeAmount', {
-                                rules: [{ required: true, message: '充值金额不能为空' }],
+                                rules: [
+                                    { required: true, message: '充值金额不能为空' },
+                                    {
+                                        validator: (rule, value, callback) => {
+                                            callback(value < 0.01 || value > 99999.99 ? '金额最多5位整数 2位小数' : !regMoney.test(value) ? '金额最多两位小数' : undefined)
+                                        }
+                                    }
+                                ],
                             })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
 

src/pages/fundManagement/components/Refund.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Modal, Button, Table, message, Input, Icon, Pagination } from 'antd';
+import { Form, Modal, Button, Table, message, Input, InputNumber, Icon, Pagination } from 'antd';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -47,6 +47,8 @@ const SelectContact = props => {
     }
 
     const { getFieldDecorator } = props.form;
+    const balance = regFenToYuan(props.realBalance)
+    const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
         <div>
             <span onClick={() => setVisible(true)}>{group.groupName}</span>
@@ -65,13 +67,20 @@ const SelectContact = props => {
                     <p style={{ color: 'red' }}>请先进行线下实际退款操作后再执行线上退款存档</p>
                     <Form {...formItemLayout} >
 
-                        <Form.Item label="充值金额" >
+                        <Form.Item label="退款金额" >
                             {getFieldDecorator('refundAmount', {
                                 rules: [{ required: true, message: '退款金额不能为空' },
-                                { max: 20 }],
+                                {
+                                    validator: (rule, value, callback) => {
+
+                                        callback(!regMoney.test(value) ? '金额最多两位小数' : value > balance.toString() ? '退款金额不能大于余额' : value < 0.01 ? '金额不得小于0.01' : undefined)
+
+                                    }
+                                }
+                                ],
                             })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
-                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{regFenToYuan(props.realBalance)}元</div>
+                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{balance}元</div>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
                                 rules: [{ required: false }],