bug fix

src/pages/fundManagement/AccountDetail.jsx

@@ -91,6 +91,15 @@ function header(props) {
         },
     ]
 
+    const getDetail = (row) => {
+        router.push({
+            pathname: '/fundManagement/AccountDetail',
+            query: {
+                id: row.orgId
+            },
+        });
+    }
+
 
     return (
 
@@ -109,7 +118,7 @@ function header(props) {
                         <XForm buttonVisible={false} fields={fields}></XForm>
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
                             <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
-                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
+                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(newsData)} accountId={newsData.accountId || ''} />
                             </Button>
                             <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>

src/pages/fundManagement/RechargeOrder.jsx

@@ -38,14 +38,14 @@ function header(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
-                let { LocalDate, ...submitValue } = values
-                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');
+                let { payDate, ...submitValue } = values
+                if (null != payDate && payDate.length > 0) {
+                    const [payStartDate, payEndDate] = payDate
+                    submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
+                    submitValue.payEndDate = moment(payEndDate).format('YYYY-MM-DD');
                 } else {
-                    submitValue.startDate = null
-                    submitValue.endDate = null
+                    submitValue.payStartDate = null
+                    submitValue.payEndDate = null
                 }
                 getList({ pageNum: 1, pageSize: 10, orderType: 'recharge', ...submitValue })
             }
@@ -53,11 +53,11 @@ function header(props) {
     }
 
     const changePageNum = (pageNumber) => {
-        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');
+        let { payDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != payDate && payDate.length > 0) {
+            const [payStartDate, payEndDate] = payDate
+            submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
+            submitValue.payStartDate = moment(payEndDate).format('YYYY-MM-DD');
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
@@ -143,7 +143,7 @@ function header(props) {
             dataIndex: 'payDate',
             key: 'payDate',
             align: 'center',
-            render: (x, row) => <><span>{row.payDate ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
+            render: (x, row) => <><span>{row.isOffline == 0 && row.payDate != null ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
         },
 
     ];
@@ -153,14 +153,14 @@ function header(props) {
     }
     // 导出
     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');
+        let { payDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != payDate && payDate.length > 0) {
+            const [payStartDate, payEndDate] = payDate
+            submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
+            submitValue.payEndDate = moment(payEndDate).format('YYYY-MM-DD');
         } else {
-            submitValue.startDate = null
-            submitValue.endDate = null
+            submitValue.payStartDate = null
+            submitValue.payEndDate = null
         }
         request({ ...apis.fund.rechargeOrderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
             if (!data) {
@@ -199,7 +199,7 @@ function header(props) {
                 </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>支付时间段：</span>
-                    {getFieldDecorator('LocalDate')(
+                    {getFieldDecorator('payDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}
                 </Form.Item>