commit

src/pages/fundManagement/AccountDetail.jsx

@@ -11,7 +11,7 @@ import XForm, { FieldTypes } from '../../components/XForm';
 import RechargeOrder from './RechargeOrder';
 import ConsumeOrder from './ConsumeOrder';
 import RefundOrder from './RefundOrder';
-
+import Recharge from './components/Recharge'
 
 function header(props) {
     const orgId = props.location.query.id || ''
@@ -91,8 +91,6 @@ function header(props) {
     ]
 
 
-
-
     return (
 
         <>
@@ -109,7 +107,9 @@ function header(props) {
                     <div>
                         <XForm buttonVisible={false} fields={fields}></XForm>
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
-                            <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>充值</Button>
+                            <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
+                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
+                            </Button>
                             <Button >返回</Button>
                         </div>
                     </div>

src/pages/fundManagement/AccountManagement.jsx

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

src/pages/fundManagement/ConsumeOrder.jsx

@@ -135,7 +135,30 @@ function header(props) {
         props.form.resetFields();
         getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' })
     }
-
+    // 导出
+    const exportList = () => {
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+        } else {
+            submitValue.startDate = null
+            submitValue.endDate = null
+        }
+        request({ ...apis.fund.orderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
+            if (!data) {
+                return
+            }
+            const url = window.URL.createObjectURL(new Blob([data]))
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', '消费订单表.xlsx')
+            document.body.append(link)
+            link.click()
+        }).catch()
+    }
     const { getFieldDecorator } = props.form
     return (
 
@@ -146,7 +169,7 @@ function header(props) {
                 onCancel={() => setVisible(false)}
                 footer={null}
             >
-                <div style={{ paddingLeft:'36%'}}>
+                <div style={{ paddingLeft: '36%' }}>
                     <p>昵称：{personInfo.nickname || ''}</p>
                     <p>头像：<img src={personInfo.avatarurl || ''} className={styles.touxiang} /></p>
                     <p>姓名：{personInfo.name || ''}</p>
@@ -211,6 +234,9 @@ function header(props) {
           </Button>
                 </Form.Item>
             </Form>
+            <div>
+                <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
+            </div>
             <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/fundManagement/RechargeOrder.jsx

@@ -130,8 +130,16 @@ function header(props) {
     }
     // 导出
     const exportList = () => {
-
-        request({ ...apis.fund.orderExport, params: { orderType: 'recharge', ...props.form.getFieldsValue() } }).then(data => {
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+        } else {
+            submitValue.startDate = null
+            submitValue.endDate = null
+        }
+        request({ ...apis.fund.orderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RefundOrder.jsx

@@ -22,6 +22,7 @@ function header(props) {
     const [refundVisible, setRefundVisible] = useState(false)
     const [inputValue, setValue] = useState('')
     const [swiperList, setSwiperList] = useState([])
+    console.log(props, "propspropspropspropspropsprops")
 
     const orgId = props.orgId || ''
 
@@ -230,6 +231,30 @@ function header(props) {
 
         setRefundVisible(false)
     }
+    // 导出
+    const exportList = () => {
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+        } else {
+            submitValue.startDate = null
+            submitValue.endDate = null
+        }
+        request({ ...apis.fund.orderExport, params: { orderType: 'refund', orgId, ...submitValue } }).then(data => {
+            if (!data) {
+                return
+            }
+            const url = window.URL.createObjectURL(new Blob([data]))
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', '退款订单表.xlsx')
+            document.body.append(link)
+            link.click()
+        }).catch()
+    }
 
     const { getFieldDecorator } = props.form
     const list = []
@@ -303,6 +328,9 @@ function header(props) {
                     </Button>
                 </Form.Item>
             </Form>
+            <div>
+                <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
+            </div>
             <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/fundManagement/components/Recharge.jsx

@@ -38,6 +38,7 @@ const SelectContact = props => {
                 request({ ...apis.fund.recharge, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
                     message.info("操作成功")
                     setVisible(false)
+                    props.onClick()
                 })
             }
         });

src/pages/fundManagement/components/Refund.jsx

@@ -37,6 +37,7 @@ const SelectContact = props => {
                 request({ ...apis.fund.accoutRefund, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
                     message.info("操作成功")
                     setVisible(false)
+                    props.onClick()
                 })
             }
         });
@@ -69,7 +70,7 @@ const SelectContact = props => {
                                 { max: 20 }],
                             })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
-                        <div style={{marginBottom:'25px'}}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{props.realBalance}元</div>
+                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{props.realBalance}元</div>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
                                 rules: [{ required: false }],